[CI-NOTIFY]: TCWG Bisect tcwg_gnu/gnu-master-arm-check_bootstrap - Build # 72 - Successful!
by ci_notify＠linaro.org
Successfully identified regression in *gcc* in CI configuration tcwg_gnu/gnu-master-arm-check_bootstrap. So far, this commit has regressed CI configurations:
- tcwg_gnu/gnu-master-arm-check_bootstrap
Culprit:
<cut>
commit 8a8a7d332d5d01db5aea7336a36d9fd71a679fb1
Author: Ian Lance Taylor <iant(a)golang.org>
Date: Mon Jun 28 16:47:55 2021 -0700
compiler: in composite literals use temps only for interfaces
For a composite literal we only need to introduce a temporary variable
if we may be converting to an interface type, so only do it then.
This saves over 80% of compilation time when using gccgo to compile
cmd/internal/obj/x86, as the GCC middle-end spends a lot of time
pointlessly computing interactions between temporary variables.
For PR debug/101064
For golang/go#46600
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/331513
</cut>
Results regressed to (for first_bad == 8a8a7d332d5d01db5aea7336a36d9fd71a679fb1)
# reset_artifacts:
-10
# build_abe bootstrap:
0
# build_abe check_bootstrap:
1
# # Comparing directories
# # REFERENCE: base-artifacts/sumfiles
# # CURRENT: /home/tcwg-buildslave/workspace/tcwg_gnu_2/artifacts/build-8a8a7d332d5d01db5aea7336a36d9fd71a679fb1/sumfiles
#
# # Comparing 12 common sum files:
# g++.sum
# gcc.sum
# gfortran.sum
# go.sum
# gotools.sum
# libatomic.sum
# libffi.sum
# libgo.sum
# libgomp.sum
# libitm.sum
# libstdc++.sum
# objc.sum
# Comparing:
# REFERENCE:/tmp/gxx-sum1.1601595
# CURRENT: /tmp/gxx-sum2.1601595
#
# ` +---------+---------+
# o RUN STATUS: | REF | RES |
# +------------------------------------------+---------+---------+
# | Passes [PASS] | 460522 | 460519 |
# | Unexpected fails [FAIL] | 194 | 197 |
# | Errors [ERROR] | 0 | 0 |
# | Unexpected passes [XPASS] | 15 | 15 |
# | Expected fails [XFAIL] | 2737 | 2737 |
# | Unresolved [UNRESOLVED] | 104 | 104 |
# | Unsupported [UNSUPPORTED] | 22896 | 22896 |
# | Untested [UNTESTED] | 10 | 10 |
# +------------------------------------------+---------+---------+
#
# REF PASS ratio: 0.952271
# RES PASS ratio: 0.952265
#
# o REGRESSIONS:
# +------------------------------------------+---------+
# | PASS now FAIL [PASS => FAIL] | 3 |
# +------------------------------------------+---------+
# | TOTAL_REGRESSIONS | 3 |
# +------------------------------------------+---------+
#
# - PASS now FAIL [PASS => FAIL]:
#
# Executed from: go.test/go-test.exp
# go:go.test/test/fixedbugs/issue19182.go execution, -O2 -g
# Executed from: /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/snapshots/gcc.git~master/libgo/libgo.exp
# libgo:os/signal
# libgo:sync/atomic
#
#
#
# o IMPROVEMENTS TO BE CHECKED:
# +------------------------------------------+---------+
# +------------------------------------------+---------+
# | TOTAL_IMPROVEMENTS_TO_BE_CHECKED | 0 |
# +------------------------------------------+---------+
#
#
# # Regressions found
# # Regressions in 12 common sum files found
from (for last_good == c60d9160b4d966dbea5b1bbea4f817c64d0bee2d)
# reset_artifacts:
-10
# build_abe bootstrap:
0
# build_abe check_bootstrap:
1
Artifacts of last_good build: https://ci.linaro.org/job/tcwg_gcc-bisect-gnu-master-arm-check_bootstrap/72…
Artifacts of first_bad build: https://ci.linaro.org/job/tcwg_gcc-bisect-gnu-master-arm-check_bootstrap/72…
Build top page/logs: https://ci.linaro.org/job/tcwg_gcc-bisect-gnu-master-arm-check_bootstrap/72/
Configuration details:
Reproduce builds:
<cut>
mkdir investigate-gcc-8a8a7d332d5d01db5aea7336a36d9fd71a679fb1
cd investigate-gcc-8a8a7d332d5d01db5aea7336a36d9fd71a679fb1
git clone https://git.linaro.org/toolchain/jenkins-scripts
mkdir -p artifacts/manifests
curl -o artifacts/manifests/build-baseline.sh https://ci.linaro.org/job/tcwg_gcc-bisect-gnu-master-arm-check_bootstrap/72… --fail
curl -o artifacts/manifests/build-parameters.sh https://ci.linaro.org/job/tcwg_gcc-bisect-gnu-master-arm-check_bootstrap/72… --fail
curl -o artifacts/test.sh https://ci.linaro.org/job/tcwg_gcc-bisect-gnu-master-arm-check_bootstrap/72… --fail
chmod +x artifacts/test.sh
# Reproduce the baseline build (build all pre-requisites)
./jenkins-scripts/tcwg_gnu-build.sh @@ artifacts/manifests/build-baseline.sh
cd gcc
# Reproduce first_bad build
git checkout --detach 8a8a7d332d5d01db5aea7336a36d9fd71a679fb1
../artifacts/test.sh
# Reproduce last_good build
git checkout --detach c60d9160b4d966dbea5b1bbea4f817c64d0bee2d
../artifacts/test.sh
cd ..
</cut>
History of pending regressions and results: https://git.linaro.org/toolchain/ci/base-artifacts.git/log/?h=linaro-local/…
Artifacts: https://ci.linaro.org/job/tcwg_gcc-bisect-gnu-master-arm-check_bootstrap/72…
Build log: https://ci.linaro.org/job/tcwg_gcc-bisect-gnu-master-arm-check_bootstrap/72…
Full commit (up to 1000 lines):
<cut>
commit 8a8a7d332d5d01db5aea7336a36d9fd71a679fb1
Author: Ian Lance Taylor <iant(a)golang.org>
Date: Mon Jun 28 16:47:55 2021 -0700
compiler: in composite literals use temps only for interfaces
For a composite literal we only need to introduce a temporary variable
if we may be converting to an interface type, so only do it then.
This saves over 80% of compilation time when using gccgo to compile
cmd/internal/obj/x86, as the GCC middle-end spends a lot of time
pointlessly computing interactions between temporary variables.
For PR debug/101064
For golang/go#46600
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/331513
---
gcc/go/gofrontend/MERGE | 2 +-
gcc/go/gofrontend/expressions.cc | 17 +++++++++++++----
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index f16fb9facc3..f7bcc8c484a 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-bcafcb3c39530bb325514d6377747eb3127d1a03
+cad187fe3aceb2a7d964b64c70dfa8c8ad24ce65
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
diff --git a/gcc/go/gofrontend/expressions.cc b/gcc/go/gofrontend/expressions.cc
index 5d45e4baab4..94342b2f9b8 100644
--- a/gcc/go/gofrontend/expressions.cc
+++ b/gcc/go/gofrontend/expressions.cc
@@ -15148,7 +15148,7 @@ Struct_construction_expression::do_copy()
}
// Flatten a struct construction expression. Store the values into
-// temporaries in case they need interface conversion.
+// temporaries if they may need interface conversion.
Expression*
Struct_construction_expression::do_flatten(Gogo*, Named_object*,
@@ -15162,10 +15162,13 @@ Struct_construction_expression::do_flatten(Gogo*, Named_object*,
return this;
Location loc = this->location();
+ const Struct_field_list* fields = this->type_->struct_type()->fields();
+ Struct_field_list::const_iterator pf = fields->begin();
for (Expression_list::iterator pv = this->vals()->begin();
pv != this->vals()->end();
- ++pv)
+ ++pv, ++pf)
{
+ go_assert(pf != fields->end());
if (*pv != NULL)
{
if ((*pv)->is_error_expression() || (*pv)->type()->is_error_type())
@@ -15173,7 +15176,8 @@ Struct_construction_expression::do_flatten(Gogo*, Named_object*,
go_assert(saw_errors());
return Expression::make_error(loc);
}
- if (!(*pv)->is_multi_eval_safe())
+ if (pf->type()->interface_type() != NULL
+ && !(*pv)->is_multi_eval_safe())
{
Temporary_statement* temp =
Statement::make_temporary(NULL, *pv, loc);
@@ -15448,7 +15452,7 @@ Array_construction_expression::do_check_types(Gogo*)
}
// Flatten an array construction expression. Store the values into
-// temporaries in case they need interface conversion.
+// temporaries if they may need interface conversion.
Expression*
Array_construction_expression::do_flatten(Gogo*, Named_object*,
@@ -15467,6 +15471,11 @@ Array_construction_expression::do_flatten(Gogo*, Named_object*,
if (this->is_constant_array() || this->is_static_initializer())
return this;
+ // If the array element type is not an interface type, we don't need
+ // temporaries.
+ if (this->type_->array_type()->element_type()->interface_type() == NULL)
+ return this;
+
Location loc = this->location();
for (Expression_list::iterator pv = this->vals()->begin();
pv != this->vals()->end();
</cut>
3 years, 10 months
- 1
- 0
[CI-NOTIFY]: TCWG Bisect tcwg_bmk_tx1/llvm-master-aarch64-spec2k6-O2_LTO - Build # 16 - Successful!
by ci_notify＠linaro.org
Successfully identified regression in *llvm* in CI configuration tcwg_bmk_llvm_tx1/llvm-master-aarch64-spec2k6-O2_LTO. So far, this commit has regressed CI configurations:
- tcwg_bmk_llvm_tx1/llvm-master-aarch64-spec2k6-O2_LTO
Culprit:
<cut>
commit 6998f8ae2d14e096aff33968f226587b5c1a193a
Author: David Sherwood <david.sherwood(a)arm.com>
Date: Wed Mar 10 08:34:19 2021 +0000
[LoopVectorize] Simplify scalar cost calculation in getInstructionCost
This patch simplifies the calculation of certain costs in
getInstructionCost when isScalarAfterVectorization() returns a true value.
There are a few places where we multiply a cost by a number N, i.e.
unsigned N = isScalarAfterVectorization(I, VF) ? VF.getKnownMinValue() : 1;
return N * TTI.getArithmeticInstrCost(...
After some investigation it seems that there are only these cases that occur
in practice:
1. VF is a scalar, in which case N = 1.
2. VF is a vector. We can only get here if: a) the instruction is a
GEP/bitcast/PHI with scalar uses, or b) this is an update to an induction
variable that remains scalar.
I have changed the code so that N is assumed to always be 1. For GEPs
the cost is always 0, since this is calculated later on as part of the
load/store cost. PHI nodes are costed separately and were never previously
multiplied by VF. For all other cases I have added an assert that none of
the users needs scalarising, which didn't fire in any unit tests.
Only one test required fixing and I believe the original cost for the scalar
add instruction to have been wrong, since only one copy remains after
vectorisation.
I have also added a new test for the case when a pointer PHI feeds directly
into a store that will be scalarised as we were previously never testing it.
Differential Revision: https://reviews.llvm.org/D99718
</cut>
Results regressed to (for first_bad == 6998f8ae2d14e096aff33968f226587b5c1a193a)
# reset_artifacts:
-10
# build_abe binutils:
-9
# build_abe stage1 -- --set gcc_override_configure=--disable-libsanitizer:
-8
# build_abe linux:
-7
# build_abe glibc:
-6
# build_abe stage2 -- --set gcc_override_configure=--disable-libsanitizer:
-5
# build_llvm true:
-3
# true:
0
# benchmark -O2_LTO -- artifacts/build-6998f8ae2d14e096aff33968f226587b5c1a193a/results_id:
1
# 462.libquantum,libquantum_base.default regressed by 113
from (for last_good == c835630c25a4f9925517949579f66a43b113fbc9)
# reset_artifacts:
-10
# build_abe binutils:
-9
# build_abe stage1 -- --set gcc_override_configure=--disable-libsanitizer:
-8
# build_abe linux:
-7
# build_abe glibc:
-6
# build_abe stage2 -- --set gcc_override_configure=--disable-libsanitizer:
-5
# build_llvm true:
-3
# true:
0
# benchmark -O2_LTO -- artifacts/build-c835630c25a4f9925517949579f66a43b113fbc9/results_id:
1
Artifacts of last_good build: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tx1-llvm-master-…
Results ID of last_good: tx1_64/tcwg_bmk_llvm_tx1/bisect-llvm-master-aarch64-spec2k6-O2_LTO/1050
Artifacts of first_bad build: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tx1-llvm-master-…
Results ID of first_bad: tx1_64/tcwg_bmk_llvm_tx1/bisect-llvm-master-aarch64-spec2k6-O2_LTO/1048
Build top page/logs: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tx1-llvm-master-…
Configuration details:
Reproduce builds:
<cut>
mkdir investigate-llvm-6998f8ae2d14e096aff33968f226587b5c1a193a
cd investigate-llvm-6998f8ae2d14e096aff33968f226587b5c1a193a
git clone https://git.linaro.org/toolchain/jenkins-scripts
mkdir -p artifacts/manifests
curl -o artifacts/manifests/build-baseline.sh https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tx1-llvm-master-… --fail
curl -o artifacts/manifests/build-parameters.sh https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tx1-llvm-master-… --fail
curl -o artifacts/test.sh https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tx1-llvm-master-… --fail
chmod +x artifacts/test.sh
# Reproduce the baseline build (build all pre-requisites)
./jenkins-scripts/tcwg_bmk-build.sh @@ artifacts/manifests/build-baseline.sh
cd llvm
# Reproduce first_bad build
git checkout --detach 6998f8ae2d14e096aff33968f226587b5c1a193a
../artifacts/test.sh
# Reproduce last_good build
git checkout --detach c835630c25a4f9925517949579f66a43b113fbc9
../artifacts/test.sh
cd ..
</cut>
History of pending regressions and results: https://git.linaro.org/toolchain/ci/base-artifacts.git/log/?h=linaro-local/…
Artifacts: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tx1-llvm-master-…
Build log: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tx1-llvm-master-…
Full commit (up to 1000 lines):
<cut>
commit 6998f8ae2d14e096aff33968f226587b5c1a193a
Author: David Sherwood <david.sherwood(a)arm.com>
Date: Wed Mar 10 08:34:19 2021 +0000
[LoopVectorize] Simplify scalar cost calculation in getInstructionCost
This patch simplifies the calculation of certain costs in
getInstructionCost when isScalarAfterVectorization() returns a true value.
There are a few places where we multiply a cost by a number N, i.e.
unsigned N = isScalarAfterVectorization(I, VF) ? VF.getKnownMinValue() : 1;
return N * TTI.getArithmeticInstrCost(...
After some investigation it seems that there are only these cases that occur
in practice:
1. VF is a scalar, in which case N = 1.
2. VF is a vector. We can only get here if: a) the instruction is a
GEP/bitcast/PHI with scalar uses, or b) this is an update to an induction
variable that remains scalar.
I have changed the code so that N is assumed to always be 1. For GEPs
the cost is always 0, since this is calculated later on as part of the
load/store cost. PHI nodes are costed separately and were never previously
multiplied by VF. For all other cases I have added an assert that none of
the users needs scalarising, which didn't fire in any unit tests.
Only one test required fixing and I believe the original cost for the scalar
add instruction to have been wrong, since only one copy remains after
vectorisation.
I have also added a new test for the case when a pointer PHI feeds directly
into a store that will be scalarised as we were previously never testing it.
Differential Revision: https://reviews.llvm.org/D99718
---
llvm/lib/Transforms/Vectorize/LoopVectorize.cpp | 73 +++++++++++++---------
.../AArch64/no_vector_instructions.ll | 2 +-
.../LoopVectorize/AArch64/predication_costs.ll | 35 +++++++++++
.../Transforms/LoopVectorize/scalarized-bitcast.ll | 40 ++++++++++++
4 files changed, 121 insertions(+), 29 deletions(-)
diff --git a/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp b/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
index 2b413fc49505..f25af23c86c2 100644
--- a/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
+++ b/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
@@ -7383,10 +7383,39 @@ LoopVectorizationCostModel::getInstructionCost(Instruction *I, ElementCount VF,
Type *RetTy = I->getType();
if (canTruncateToMinimalBitwidth(I, VF))
RetTy = IntegerType::get(RetTy->getContext(), MinBWs[I]);
- VectorTy = isScalarAfterVectorization(I, VF) ? RetTy : ToVectorTy(RetTy, VF);
auto SE = PSE.getSE();
TTI::TargetCostKind CostKind = TTI::TCK_RecipThroughput;
+ auto hasSingleCopyAfterVectorization = [this](Instruction *I,
+ ElementCount VF) -> bool {
+ if (VF.isScalar())
+ return true;
+
+ auto Scalarized = InstsToScalarize.find(VF);
+ assert(Scalarized != InstsToScalarize.end() &&
+ "VF not yet analyzed for scalarization profitability");
+ return !Scalarized->second.count(I) &&
+ llvm::all_of(I->users(), [&](User *U) {
+ auto *UI = cast<Instruction>(U);
+ return !Scalarized->second.count(UI);
+ });
+ };
+
+ if (isScalarAfterVectorization(I, VF)) {
+ // With the exception of GEPs and PHIs, after scalarization there should
+ // only be one copy of the instruction generated in the loop. This is
+ // because the VF is either 1, or any instructions that need scalarizing
+ // have already been dealt with by the the time we get here. As a result,
+ // it means we don't have to multiply the instruction cost by VF.
+ assert(I->getOpcode() == Instruction::GetElementPtr ||
+ I->getOpcode() == Instruction::PHI ||
+ (I->getOpcode() == Instruction::BitCast &&
+ I->getType()->isPointerTy()) ||
+ hasSingleCopyAfterVectorization(I, VF));
+ VectorTy = RetTy;
+ } else
+ VectorTy = ToVectorTy(RetTy, VF);
+
// TODO: We need to estimate the cost of intrinsic calls.
switch (I->getOpcode()) {
case Instruction::GetElementPtr:
@@ -7514,21 +7543,16 @@ LoopVectorizationCostModel::getInstructionCost(Instruction *I, ElementCount VF,
Op2VK = TargetTransformInfo::OK_UniformValue;
SmallVector<const Value *, 4> Operands(I->operand_values());
- unsigned N = isScalarAfterVectorization(I, VF) ? VF.getKnownMinValue() : 1;
- return N * TTI.getArithmeticInstrCost(
- I->getOpcode(), VectorTy, CostKind,
- TargetTransformInfo::OK_AnyValue,
- Op2VK, TargetTransformInfo::OP_None, Op2VP, Operands, I);
+ return TTI.getArithmeticInstrCost(
+ I->getOpcode(), VectorTy, CostKind, TargetTransformInfo::OK_AnyValue,
+ Op2VK, TargetTransformInfo::OP_None, Op2VP, Operands, I);
}
case Instruction::FNeg: {
assert(!VF.isScalable() && "VF is assumed to be non scalable.");
- unsigned N = isScalarAfterVectorization(I, VF) ? VF.getKnownMinValue() : 1;
- return N * TTI.getArithmeticInstrCost(
- I->getOpcode(), VectorTy, CostKind,
- TargetTransformInfo::OK_AnyValue,
- TargetTransformInfo::OK_AnyValue,
- TargetTransformInfo::OP_None, TargetTransformInfo::OP_None,
- I->getOperand(0), I);
+ return TTI.getArithmeticInstrCost(
+ I->getOpcode(), VectorTy, CostKind, TargetTransformInfo::OK_AnyValue,
+ TargetTransformInfo::OK_AnyValue, TargetTransformInfo::OP_None,
+ TargetTransformInfo::OP_None, I->getOperand(0), I);
}
case Instruction::Select: {
SelectInst *SI = cast<SelectInst>(I);
@@ -7583,6 +7607,10 @@ LoopVectorizationCostModel::getInstructionCost(Instruction *I, ElementCount VF,
VectorTy = ToVectorTy(getMemInstValueType(I), Width);
return getMemoryInstructionCost(I, VF);
}
+ case Instruction::BitCast:
+ if (I->getType()->isPointerTy())
+ return 0;
+ LLVM_FALLTHROUGH;
case Instruction::ZExt:
case Instruction::SExt:
case Instruction::FPToUI:
@@ -7593,8 +7621,7 @@ LoopVectorizationCostModel::getInstructionCost(Instruction *I, ElementCount VF,
case Instruction::SIToFP:
case Instruction::UIToFP:
case Instruction::Trunc:
- case Instruction::FPTrunc:
- case Instruction::BitCast: {
+ case Instruction::FPTrunc: {
// Computes the CastContextHint from a Load/Store instruction.
auto ComputeCCH = [&](Instruction *I) -> TTI::CastContextHint {
assert((isa<LoadInst>(I) || isa<StoreInst>(I)) &&
@@ -7672,14 +7699,7 @@ LoopVectorizationCostModel::getInstructionCost(Instruction *I, ElementCount VF,
}
}
- unsigned N;
- if (isScalarAfterVectorization(I, VF)) {
- assert(!VF.isScalable() && "VF is assumed to be non scalable");
- N = VF.getKnownMinValue();
- } else
- N = 1;
- return N *
- TTI.getCastInstrCost(Opcode, VectorTy, SrcVecTy, CCH, CostKind, I);
+ return TTI.getCastInstrCost(Opcode, VectorTy, SrcVecTy, CCH, CostKind, I);
}
case Instruction::Call: {
bool NeedToScalarize;
@@ -7694,11 +7714,8 @@ LoopVectorizationCostModel::getInstructionCost(Instruction *I, ElementCount VF,
case Instruction::ExtractValue:
return TTI.getInstructionCost(I, TTI::TCK_RecipThroughput);
default:
- // The cost of executing VF copies of the scalar instruction. This opcode
- // is unknown. Assume that it is the same as 'mul'.
- return VF.getKnownMinValue() * TTI.getArithmeticInstrCost(
- Instruction::Mul, VectorTy, CostKind) +
- getScalarizationOverhead(I, VF);
+ // This opcode is unknown. Assume that it is the same as 'mul'.
+ return TTI.getArithmeticInstrCost(Instruction::Mul, VectorTy, CostKind);
} // end of switch.
}
diff --git a/llvm/test/Transforms/LoopVectorize/AArch64/no_vector_instructions.ll b/llvm/test/Transforms/LoopVectorize/AArch64/no_vector_instructions.ll
index 247ea35ff5d0..3061998518ad 100644
--- a/llvm/test/Transforms/LoopVectorize/AArch64/no_vector_instructions.ll
+++ b/llvm/test/Transforms/LoopVectorize/AArch64/no_vector_instructions.ll
@@ -6,7 +6,7 @@ target triple = "aarch64--linux-gnu"
; CHECK-LABEL: all_scalar
; CHECK: LV: Found scalar instruction: %i.next = add nuw nsw i64 %i, 2
-; CHECK: LV: Found an estimated cost of 2 for VF 2 For instruction: %i.next = add nuw nsw i64 %i, 2
+; CHECK: LV: Found an estimated cost of 1 for VF 2 For instruction: %i.next = add nuw nsw i64 %i, 2
; CHECK: LV: Not considering vector loop of width 2 because it will not generate any vector instructions
;
define void @all_scalar(i64* %a, i64 %n) {
diff --git a/llvm/test/Transforms/LoopVectorize/AArch64/predication_costs.ll b/llvm/test/Transforms/LoopVectorize/AArch64/predication_costs.ll
index b0ebb4edf2ad..858b28ddd321 100644
--- a/llvm/test/Transforms/LoopVectorize/AArch64/predication_costs.ll
+++ b/llvm/test/Transforms/LoopVectorize/AArch64/predication_costs.ll
@@ -86,6 +86,41 @@ for.end:
ret void
}
+; CHECK-LABEL: predicated_store_phi
+;
+; Same as predicate_store except we use a pointer PHI to maintain the address
+;
+; CHECK: Found new scalar instruction: %addr = phi i32* [ %a, %entry ], [ %addr.next, %for.inc ]
+; CHECK: Found new scalar instruction: %addr.next = getelementptr inbounds i32, i32* %addr, i64 1
+; CHECK: Scalarizing and predicating: store i32 %tmp2, i32* %addr, align 4
+; CHECK: Found an estimated cost of 0 for VF 2 For instruction: %addr = phi i32* [ %a, %entry ], [ %addr.next, %for.inc ]
+; CHECK: Found an estimated cost of 3 for VF 2 For instruction: store i32 %tmp2, i32* %addr, align 4
+;
+define void @predicated_store_phi(i32* %a, i1 %c, i32 %x, i64 %n) {
+entry:
+ br label %for.body
+
+for.body:
+ %i = phi i64 [ 0, %entry ], [ %i.next, %for.inc ]
+ %addr = phi i32 * [ %a, %entry ], [ %addr.next, %for.inc ]
+ %tmp1 = load i32, i32* %addr, align 4
+ %tmp2 = add nsw i32 %tmp1, %x
+ br i1 %c, label %if.then, label %for.inc
+
+if.then:
+ store i32 %tmp2, i32* %addr, align 4
+ br label %for.inc
+
+for.inc:
+ %i.next = add nuw nsw i64 %i, 1
+ %cond = icmp slt i64 %i.next, %n
+ %addr.next = getelementptr inbounds i32, i32* %addr, i64 1
+ br i1 %cond, label %for.body, label %for.end
+
+for.end:
+ ret void
+}
+
; CHECK-LABEL: predicated_udiv_scalarized_operand
;
; This test checks that we correctly compute the cost of the predicated udiv
diff --git a/llvm/test/Transforms/LoopVectorize/scalarized-bitcast.ll b/llvm/test/Transforms/LoopVectorize/scalarized-bitcast.ll
new file mode 100644
index 000000000000..0c97e6ac475e
--- /dev/null
+++ b/llvm/test/Transforms/LoopVectorize/scalarized-bitcast.ll
@@ -0,0 +1,40 @@
+; REQUIRES: asserts
+; RUN: opt -loop-vectorize -force-vector-width=2 -debug-only=loop-vectorize -S -o - < %s 2>&1 | FileCheck %s
+
+%struct.foo = type { i32, i64 }
+
+; CHECK: LV: Found an estimated cost of 0 for VF 2 For instruction: %0 = bitcast i64* %b to i32*
+
+; The bitcast below will be scalarized due to the predication in the loop. Bitcasts
+; between pointer types should be treated as free, despite the scalarization.
+define void @foo(%struct.foo* noalias nocapture %in, i32* noalias nocapture readnone %out, i64 %n) {
+entry:
+ br label %for.body
+
+for.body: ; preds = %entry, %if.end
+ %i.012 = phi i64 [ %inc, %if.end ], [ 0, %entry ]
+ %b = getelementptr inbounds %struct.foo, %struct.foo* %in, i64 %i.012, i32 1
+ %0 = bitcast i64* %b to i32*
+ %a = getelementptr inbounds %struct.foo, %struct.foo* %in, i64 %i.012, i32 0
+ %1 = load i32, i32* %a, align 8
+ %tobool.not = icmp eq i32 %1, 0
+ br i1 %tobool.not, label %if.end, label %land.lhs.true
+
+land.lhs.true: ; preds = %for.body
+ %2 = load i32, i32* %0, align 4
+ %cmp2 = icmp sgt i32 %2, 0
+ br i1 %cmp2, label %if.then, label %if.end
+
+if.then: ; preds = %land.lhs.true
+ %sub = add nsw i32 %2, -1
+ store i32 %sub, i32* %0, align 4
+ br label %if.end
+
+if.end: ; preds = %if.then, %land.lhs.true, %for.body
+ %inc = add nuw nsw i64 %i.012, 1
+ %exitcond.not = icmp eq i64 %inc, %n
+ br i1 %exitcond.not, label %for.end, label %for.body
+
+for.end: ; preds = %if.end
+ ret void
+}
</cut>
3 years, 10 months
- 1
- 0
[CI-NOTIFY]: TCWG Bisect tcwg_gnu/gnu-master-arm-check_bootstrap - Build # 71 - Successful!
by ci_notify＠linaro.org
Successfully identified regression in *gcc* in CI configuration tcwg_gnu/gnu-master-arm-check_bootstrap. So far, this commit has regressed CI configurations:
- tcwg_gnu/gnu-master-arm-check_bootstrap
Culprit:
<cut>
commit c60d9160b4d966dbea5b1bbea4f817c64d0bee2d
Author: Uros Bizjak <ubizjak(a)gmail.com>
Date: Tue Jun 29 19:14:35 2021 +0200
i386: Add V2SFmode vec_addsub pattern [PR95046]
gcc/
2021-06-21 Uroš Bizjak <ubizjak(a)gmail.com>
PR target/95046
* config/i386/mmx.md (vec_addsubv2sf3): New insn pattern.
gcc/testsuite/
2021-06-21 Uroš Bizjak <ubizjak(a)gmail.com>
PR target/95046
* gcc.target/i386/pr95046-9.c: New test.
</cut>
Results regressed to (for first_bad == c60d9160b4d966dbea5b1bbea4f817c64d0bee2d)
# reset_artifacts:
-10
# build_abe bootstrap:
0
# build_abe check_bootstrap:
1
# # Comparing directories
# # REFERENCE: base-artifacts/sumfiles
# # CURRENT: /home/tcwg-buildslave/workspace/tcwg_gnu_2/artifacts/build-c60d9160b4d966dbea5b1bbea4f817c64d0bee2d/sumfiles
#
# # Comparing 12 common sum files:
# g++.sum
# gcc.sum
# gfortran.sum
# go.sum
# gotools.sum
# libatomic.sum
# libffi.sum
# libgo.sum
# libgomp.sum
# libitm.sum
# libstdc++.sum
# objc.sum
# Comparing:
# REFERENCE:/tmp/gxx-sum1.3448361
# CURRENT: /tmp/gxx-sum2.3448361
#
# ` +---------+---------+
# o RUN STATUS: | REF | RES |
# +------------------------------------------+---------+---------+
# | Passes [PASS] | 460521 | 460519 |
# | Unexpected fails [FAIL] | 195 | 197 |
# | Errors [ERROR] | 0 | 0 |
# | Unexpected passes [XPASS] | 15 | 15 |
# | Expected fails [XFAIL] | 2737 | 2737 |
# | Unresolved [UNRESOLVED] | 104 | 104 |
# | Unsupported [UNSUPPORTED] | 22896 | 22896 |
# | Untested [UNTESTED] | 10 | 10 |
# +------------------------------------------+---------+---------+
#
# REF PASS ratio: 0.952269
# RES PASS ratio: 0.952265
#
# o REGRESSIONS:
# +------------------------------------------+---------+
# | PASS now FAIL [PASS => FAIL] | 1 |
# | FAIL appears [ => FAIL] | 1 |
# +------------------------------------------+---------+
# | TOTAL_REGRESSIONS | 2 |
# +------------------------------------------+---------+
#
# - PASS now FAIL [PASS => FAIL]:
#
# Executed from: g++.dg/dg.exp
# g++:g++.dg/warn/Wextra-semi.C -std=gnu++14 (test for excess errors)
#
#
# - FAIL appears [ => FAIL]:
#
# Executed from: g++.dg/dg.exp
# g++:g++.dg/warn/Wextra-semi.C -std=gnu++14 expected multiline pattern lines 21-23 not found: " friend void bar\(\) \{\};.*\n \^\n -.*\n"
#
#
#
# o IMPROVEMENTS TO BE CHECKED:
# +------------------------------------------+---------+
# | PASS disappears [PASS => ] | 1 |
# +------------------------------------------+---------+
# | TOTAL_IMPROVEMENTS_TO_BE_CHECKED | 1 |
# +------------------------------------------+---------+
#
# - PASS disappears [PASS => ]:
#
# Executed from: g++.dg/dg.exp
# g++:g++.dg/warn/Wextra-semi.C -std=gnu++14 expected multiline pattern lines 21-23 was found: " friend void bar\(\) \{\};.*\n \^\n -.*\n"
#
#
#
# # Regressions found
# # Regressions in 12 common sum files found
from (for last_good == c0f8c22a3e9f8cd45c1cb4be5f83afbebe3bfdc9)
# reset_artifacts:
-10
# build_abe bootstrap:
0
# build_abe check_bootstrap:
1
Artifacts of last_good build: https://ci.linaro.org/job/tcwg_gcc-bisect-gnu-master-arm-check_bootstrap/71…
Artifacts of first_bad build: https://ci.linaro.org/job/tcwg_gcc-bisect-gnu-master-arm-check_bootstrap/71…
Build top page/logs: https://ci.linaro.org/job/tcwg_gcc-bisect-gnu-master-arm-check_bootstrap/71/
Configuration details:
Reproduce builds:
<cut>
mkdir investigate-gcc-c60d9160b4d966dbea5b1bbea4f817c64d0bee2d
cd investigate-gcc-c60d9160b4d966dbea5b1bbea4f817c64d0bee2d
git clone https://git.linaro.org/toolchain/jenkins-scripts
mkdir -p artifacts/manifests
curl -o artifacts/manifests/build-baseline.sh https://ci.linaro.org/job/tcwg_gcc-bisect-gnu-master-arm-check_bootstrap/71… --fail
curl -o artifacts/manifests/build-parameters.sh https://ci.linaro.org/job/tcwg_gcc-bisect-gnu-master-arm-check_bootstrap/71… --fail
curl -o artifacts/test.sh https://ci.linaro.org/job/tcwg_gcc-bisect-gnu-master-arm-check_bootstrap/71… --fail
chmod +x artifacts/test.sh
# Reproduce the baseline build (build all pre-requisites)
./jenkins-scripts/tcwg_gnu-build.sh @@ artifacts/manifests/build-baseline.sh
cd gcc
# Reproduce first_bad build
git checkout --detach c60d9160b4d966dbea5b1bbea4f817c64d0bee2d
../artifacts/test.sh
# Reproduce last_good build
git checkout --detach c0f8c22a3e9f8cd45c1cb4be5f83afbebe3bfdc9
../artifacts/test.sh
cd ..
</cut>
History of pending regressions and results: https://git.linaro.org/toolchain/ci/base-artifacts.git/log/?h=linaro-local/…
Artifacts: https://ci.linaro.org/job/tcwg_gcc-bisect-gnu-master-arm-check_bootstrap/71…
Build log: https://ci.linaro.org/job/tcwg_gcc-bisect-gnu-master-arm-check_bootstrap/71…
Full commit (up to 1000 lines):
<cut>
commit c60d9160b4d966dbea5b1bbea4f817c64d0bee2d
Author: Uros Bizjak <ubizjak(a)gmail.com>
Date: Tue Jun 29 19:14:35 2021 +0200
i386: Add V2SFmode vec_addsub pattern [PR95046]
gcc/
2021-06-21 Uroš Bizjak <ubizjak(a)gmail.com>
PR target/95046
* config/i386/mmx.md (vec_addsubv2sf3): New insn pattern.
gcc/testsuite/
2021-06-21 Uroš Bizjak <ubizjak(a)gmail.com>
PR target/95046
* gcc.target/i386/pr95046-9.c: New test.
---
gcc/config/i386/mmx.md | 18 ++++++++++++++++++
gcc/testsuite/gcc.target/i386/pr95046-9.c | 14 ++++++++++++++
2 files changed, 32 insertions(+)
diff --git a/gcc/config/i386/mmx.md b/gcc/config/i386/mmx.md
index e887f03474d..5f10572718d 100644
--- a/gcc/config/i386/mmx.md
+++ b/gcc/config/i386/mmx.md
@@ -788,6 +788,24 @@
(set_attr "prefix_extra" "1")
(set_attr "mode" "V2SF")])
+(define_insn "vec_addsubv2sf3"
+ [(set (match_operand:V2SF 0 "register_operand" "=x,x")
+ (vec_merge:V2SF
+ (minus:V2SF
+ (match_operand:V2SF 1 "register_operand" "0,x")
+ (match_operand:V2SF 2 "register_operand" "x,x"))
+ (plus:V2SF (match_dup 1) (match_dup 2))
+ (const_int 1)))]
+ "TARGET_SSE3 && TARGET_MMX_WITH_SSE"
+ "@
+ addsubps\t{%2, %0|%0, %2}
+ vaddsubps\t{%2, %1, %0|%0, %1, %2}"
+ [(set_attr "isa" "noavx,avx")
+ (set_attr "type" "sseadd")
+ (set_attr "prefix" "orig,vex")
+ (set_attr "prefix_rep" "1,*")
+ (set_attr "mode" "V4SF")])
+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; Parallel single-precision floating point comparisons
diff --git a/gcc/testsuite/gcc.target/i386/pr95046-9.c b/gcc/testsuite/gcc.target/i386/pr95046-9.c
new file mode 100644
index 00000000000..54e948ccfb0
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr95046-9.c
@@ -0,0 +1,14 @@
+/* PR target/95046 */
+/* { dg-do compile { target { ! ia32 } } } */
+/* { dg-options "-O3 -msse3" } */
+
+float r[2], a[2], b[2];
+
+void
+test (void)
+{
+ r[0] = a[0] - b[0];
+ r[1] = a[1] + b[1];
+}
+
+/* { dg-final { scan-assembler "\tv?addsubps" } } */
</cut>
3 years, 10 months
- 1
- 0
[CI-NOTIFY]: TCWG Bisect tcwg_bmk_tx1/gnu-master-aarch64-spec2k6-O2_LTO - Build # 19 - Successful!
by ci_notify＠linaro.org
Successfully identified regression in *glibc* in CI configuration tcwg_bmk_gnu_tx1/gnu-master-aarch64-spec2k6-O2_LTO. So far, this commit has regressed CI configurations:
- tcwg_bmk_gnu_tx1/gnu-master-aarch64-spec2k6-O2_LTO
Culprit:
<cut>
commit 8208be389bce84be0e1c35a3daa0c3467418f921
Author: Florian Weimer <fweimer(a)redhat.com>
Date: Mon Jun 28 08:33:57 2021 +0200
Install shared objects under their ABI names
Previously, the installed objects were named like libc-2.33.so,
and the ABI soname libc.so.6 was just a symbolic link.
The Makefile targets to install these symbolic links are no longer
needed after this, so they are removed with this commit. The more
general $(make-link) command (which invokes scripts/rellns-sh) is
retained because other symbolic links are still needed.
Reviewed-by: Carlos O'Donell <carlos(a)redhat.com>
Tested-by: Carlos O'Donell <carlos(a)rehdat.com>
</cut>
Results regressed to (for first_bad == 8208be389bce84be0e1c35a3daa0c3467418f921)
# reset_artifacts:
-10
# build_abe binutils:
-9
# build_abe stage1 -- --set gcc_override_configure=--disable-libsanitizer:
-8
# build_abe linux:
-7
# build_abe glibc:
-6
# build_abe stage2 -- --set gcc_override_configure=--disable-libsanitizer:
-5
# true:
0
# benchmark -O2_LTO -- artifacts/build-8208be389bce84be0e1c35a3daa0c3467418f921/results_id:
1
# 434.zeusmp,zeusmp_base.default regressed by 7549591
# 435.gromacs,gromacs_base.default regressed by 10863956
# 447.dealII,dealII_base.default regressed by 12999253
# 454.calculix,calculix_base.default regressed by 3929138
# 465.tonto,tonto_base.default regressed by 12056000
# 459.GemsFDTD,GemsFDTD_base.default regressed by 7978538
# 410.bwaves,bwaves_base.default regressed by 8373106
# 416.gamess,gamess_base.default regressed by 4372732
# 481.wrf,wrf_base.default regressed by 8973237
# 436.cactusADM,cactusADM_base.default regressed by 4181826
# 437.leslie3d,leslie3d_base.default regressed by 7255644
from (for last_good == 6bf789d69e6be48419094ca98f064e00297a27d5)
# reset_artifacts:
-10
# build_abe binutils:
-9
# build_abe stage1 -- --set gcc_override_configure=--disable-libsanitizer:
-8
# build_abe linux:
-7
# build_abe glibc:
-6
# build_abe stage2 -- --set gcc_override_configure=--disable-libsanitizer:
-5
# true:
0
# benchmark -O2_LTO -- artifacts/build-6bf789d69e6be48419094ca98f064e00297a27d5/results_id:
1
Artifacts of last_good build: https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tx1-gnu-master-aa…
Results ID of last_good: tx1_64/tcwg_bmk_gnu_tx1/bisect-gnu-master-aarch64-spec2k6-O2_LTO/976
Artifacts of first_bad build: https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tx1-gnu-master-aa…
Results ID of first_bad: tx1_64/tcwg_bmk_gnu_tx1/bisect-gnu-master-aarch64-spec2k6-O2_LTO/988
Build top page/logs: https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tx1-gnu-master-aa…
Configuration details:
Reproduce builds:
<cut>
mkdir investigate-glibc-8208be389bce84be0e1c35a3daa0c3467418f921
cd investigate-glibc-8208be389bce84be0e1c35a3daa0c3467418f921
git clone https://git.linaro.org/toolchain/jenkins-scripts
mkdir -p artifacts/manifests
curl -o artifacts/manifests/build-baseline.sh https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tx1-gnu-master-aa… --fail
curl -o artifacts/manifests/build-parameters.sh https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tx1-gnu-master-aa… --fail
curl -o artifacts/test.sh https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tx1-gnu-master-aa… --fail
chmod +x artifacts/test.sh
# Reproduce the baseline build (build all pre-requisites)
./jenkins-scripts/tcwg_bmk-build.sh @@ artifacts/manifests/build-baseline.sh
cd glibc
# Reproduce first_bad build
git checkout --detach 8208be389bce84be0e1c35a3daa0c3467418f921
../artifacts/test.sh
# Reproduce last_good build
git checkout --detach 6bf789d69e6be48419094ca98f064e00297a27d5
../artifacts/test.sh
cd ..
</cut>
History of pending regressions and results: https://git.linaro.org/toolchain/ci/base-artifacts.git/log/?h=linaro-local/…
Artifacts: https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tx1-gnu-master-aa…
Build log: https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tx1-gnu-master-aa…
Full commit (up to 1000 lines):
<cut>
commit 8208be389bce84be0e1c35a3daa0c3467418f921
Author: Florian Weimer <fweimer(a)redhat.com>
Date: Mon Jun 28 08:33:57 2021 +0200
Install shared objects under their ABI names
Previously, the installed objects were named like libc-2.33.so,
and the ABI soname libc.so.6 was just a symbolic link.
The Makefile targets to install these symbolic links are no longer
needed after this, so they are removed with this commit. The more
general $(make-link) command (which invokes scripts/rellns-sh) is
retained because other symbolic links are still needed.
Reviewed-by: Carlos O'Donell <carlos(a)redhat.com>
Tested-by: Carlos O'Donell <carlos(a)rehdat.com>
---
Makefile | 6 ------
Makerules | 45 +++++----------------------------------------
NEWS | 8 ++++++++
elf/Makefile | 10 ++--------
4 files changed, 15 insertions(+), 54 deletions(-)
diff --git a/Makefile b/Makefile
index 0157b53cb8..f98d5a9e67 100644
--- a/Makefile
+++ b/Makefile
@@ -109,12 +109,6 @@ elf/ldso_install:
# Ignore the error if we cannot update /etc/ld.so.cache.
ifeq (no,$(cross-compiling))
ifeq (yes,$(build-shared))
-install: install-symbolic-link
-.PHONY: install-symbolic-link
-install-symbolic-link: subdir_install
- $(symbolic-link-prog) $(symbolic-link-list)
- rm -f $(symbolic-link-list)
-
install:
-test ! -x $(elf-objpfx)ldconfig || LC_ALL=C \
$(elf-objpfx)ldconfig $(addprefix -r ,$(install_root)) \
diff --git a/Makerules b/Makerules
index f2587907fb..596fa68376 100644
--- a/Makerules
+++ b/Makerules
@@ -990,14 +990,12 @@ versioned := $(strip $(foreach so,$(install-lib.so),\
install-lib.so-versioned := $(filter $(versioned), $(install-lib.so))
install-lib.so-unversioned := $(filter-out $(versioned), $(install-lib.so))
-# For libraries whose soname have version numbers, we install three files:
+# For libraries whose soname have version numbers, we install two files:
# $(inst_libdir)/libfoo.so -- for linking, symlink or ld script
-# $(inst_slibdir)/libfoo.so.NN -- for loading by SONAME, symlink
-# $(inst_slibdir)/libfoo-X.Y.Z.so -- the real shared object file
+# $(inst_slibdir)/libfoo.so.NN -- for loading by SONAME
install-lib-nosubdir: $(install-lib.so-unversioned:%=$(inst_slibdir)/%) \
$(foreach L,$(install-lib.so-versioned),\
$(inst_libdir)/$L \
- $(inst_slibdir)/$(L:.so=)-$(version).so \
$(inst_slibdir)/$L$($L-version))
# Install all the unversioned shared libraries.
@@ -1030,35 +1028,10 @@ ln -f $(objpfx)/$(@F) $@
endef
endif
-ifeq (yes,$(build-shared))
-ifeq (no,$(cross-compiling))
-symbolic-link-prog := $(elf-objpfx)sln
-symbolic-link-list := $(elf-objpfx)symlink.list
-define make-shlib-link
-echo `$(..)scripts/rellns-sh -p $< $@` $@ >> $(symbolic-link-list)
-endef
-else # cross-compiling
-# We need a definition that can be used by elf/Makefile's install rules.
-symbolic-link-prog = $(LN_S)
-endif
-endif
-ifndef make-shlib-link
-define make-shlib-link
-rm -f $@
-$(LN_S) `$(..)scripts/rellns-sh -p $< $@` $@
-endef
-endif
-
ifdef libc.so-version
-# For a library specified to be version N, install three files:
-# libc.so -> libc.so.N (e.g. libc.so.6)
-# libc.so.6 -> libc-VERSION.so (e.g. libc-1.10.so)
-
-$(inst_slibdir)/libc.so$(libc.so-version): $(inst_slibdir)/libc-$(version).so \
- $(+force)
- $(make-shlib-link)
-$(inst_slibdir)/libc-$(version).so: $(common-objpfx)libc.so $(+force)
+$(inst_slibdir)/libc.so$(libc.so-version): $(common-objpfx)libc.so $(+force)
$(do-install-program)
+
install: $(inst_slibdir)/libc.so$(libc.so-version)
# This fragment of linker script gives the OUTPUT_FORMAT statement
@@ -1126,15 +1099,7 @@ include $(o-iterator)
generated += $(foreach o,$(versioned),$o$($o-version))
define o-iterator-doit
-$(inst_slibdir)/$o$($o-version): $(inst_slibdir)/$(o:.so=)-$(version).so \
- $(+force);
- $$(make-shlib-link)
-endef
-object-suffixes-left := $(versioned)
-include $(o-iterator)
-
-define o-iterator-doit
-$(inst_slibdir)/$(o:.so=)-$(version).so: $(objpfx)$o $(+force);
+$(inst_slibdir)/$o$($o-version): $(objpfx)$o $(+force);
$$(do-install-program)
endef
object-suffixes-left := $(versioned)
diff --git a/NEWS b/NEWS
index b24ebf9898..37ba4334c6 100644
--- a/NEWS
+++ b/NEWS
@@ -74,6 +74,14 @@ Deprecated and removed features, and other changes affecting compatibility:
buggy kernel interfaces (for instance some CIFS version) that could still
see spurious EINTR error when cancellation interrupts a blocking syscall.
+* Previously, glibc installed its various shared objects under versioned
+ file names such as libc-2.33.so. The ABI sonames (e.g., libc.so.6)
+ were provided as symbolic links. Starting with glibc 2.34, the shared
+ objects are installed under their ABI sonames directly, without
+ symbolic links. This increases compatibility with distribution
+ package managers that delete removed files late during the package
+ upgrade or downgrade process.
+
Changes to build and runtime requirements:
* On Linux, the shm_open, sem_open, and related functions now expect the
diff --git a/elf/Makefile b/elf/Makefile
index 62f7e8a225..cdbcc14087 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -630,20 +630,14 @@ $(objpfx)trusted-dirs.st: Makefile $(..)Makeconfig
CPPFLAGS-dl-load.c += -I$(objpfx). -I$(csu-objpfx).
ifeq (yes,$(build-shared))
-$(inst_slibdir)/$(rtld-version-installed-name): $(objpfx)ld.so $(+force)
+$(inst_rtlddir)/$(rtld-installed-name): $(objpfx)ld.so $(+force)
$(make-target-directory)
$(do-install-program)
-$(inst_rtlddir)/$(rtld-installed-name): \
- $(inst_slibdir)/$(rtld-version-installed-name) \
- $(inst_slibdir)/libc-$(version).so
- $(make-target-directory)
- $(make-shlib-link)
-
# Special target called by parent to install just the dynamic linker.
.PHONY: ldso_install
ldso_install: $(inst_rtlddir)/$(rtld-installed-name)
-endif
+endif # $(build-shared)
# Workarounds for ${exec_prefix} expansion in configure variables.
</cut>
3 years, 10 months
- 1
- 0
[CI-NOTIFY]: TCWG Bisect tcwg_bmk_tx1/llvm-release-aarch64-spec2k6-Os - Build # 5 - Successful!
by ci_notify＠linaro.org
Successfully identified regression in *llvm* in CI configuration tcwg_bmk_llvm_tx1/llvm-release-aarch64-spec2k6-Os. So far, this commit has regressed CI configurations:
- tcwg_bmk_llvm_tx1/llvm-release-aarch64-spec2k6-Os
Culprit:
<cut>
commit f96fef89b5eca29f2dc41e97829c20bf742cdcd9
Author: Fangrui Song <i(a)maskray.me>
Date: Tue Nov 24 09:51:32 2020 -0800
[Driver] Default Generic_GCC aarch64 to -fasynchronous-unwind-tables
In GCC, `aarch64-*-linux` and `aarch64-*-freebsd` made the switch in 2018
(https://gcc.gnu.org/pipermail/gcc-patches/2018-March/495549.html).
In Clang, FreeBSD/Fuchsia/NetBSD/MinGW aarch64 default to -fasynchronous-unwind-tables.
This patch defaults Generic_GCC aarch64 (which affects Linux) to use -fasynchronous-unwind-tables.
Reviewed By: nickdesaulniers
Differential Revision: https://reviews.llvm.org/D91760
</cut>
Results regressed to (for first_bad == f96fef89b5eca29f2dc41e97829c20bf742cdcd9)
# reset_artifacts:
-10
# build_abe binutils:
-9
# build_abe stage1 -- --set gcc_override_configure=--disable-libsanitizer:
-8
# build_abe linux:
-7
# build_abe glibc:
-6
# build_abe stage2 -- --set gcc_override_configure=--disable-libsanitizer:
-5
# build_llvm true:
-3
# true:
0
# benchmark -Os -- artifacts/build-f96fef89b5eca29f2dc41e97829c20bf742cdcd9/results_id:
1
# 433.milc,milc_base.default regressed by 112
# 445.gobmk,gobmk_base.default regressed by 108
# 447.dealII,dealII_base.default regressed by 102
# 400.perlbench,perlbench_base.default regressed by 109
# 401.bzip2,bzip2_base.default regressed by 107
# 403.gcc,gcc_base.default regressed by 107
# 429.mcf,mcf_base.default regressed by 110
# 450.soplex,soplex_base.default regressed by 103
# 453.povray,povray_base.default regressed by 102
# 456.hmmer,hmmer_base.default regressed by 110
# 458.sjeng,sjeng_base.default regressed by 105
# 462.libquantum,libquantum_base.default regressed by 113
# 464.h264ref,h264ref_base.default regressed by 105
# 470.lbm,lbm_base.default regressed by 108
# 471.omnetpp,omnetpp_base.default regressed by 104
# 473.astar,astar_base.default regressed by 105
# 482.sphinx3,sphinx_livepretend_base.default regressed by 110
from (for last_good == 4926eed59c77bb452539d88a0a8ba3f3c21c4016)
# reset_artifacts:
-10
# build_abe binutils:
-9
# build_abe stage1 -- --set gcc_override_configure=--disable-libsanitizer:
-8
# build_abe linux:
-7
# build_abe glibc:
-6
# build_abe stage2 -- --set gcc_override_configure=--disable-libsanitizer:
-5
# build_llvm true:
-3
# true:
0
# benchmark -Os -- artifacts/build-4926eed59c77bb452539d88a0a8ba3f3c21c4016/results_id:
1
Artifacts of last_good build: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tx1-llvm-release…
Results ID of last_good: tx1_64/tcwg_bmk_llvm_tx1/bisect-llvm-release-aarch64-spec2k6-Os/934
Artifacts of first_bad build: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tx1-llvm-release…
Results ID of first_bad: tx1_64/tcwg_bmk_llvm_tx1/bisect-llvm-release-aarch64-spec2k6-Os/963
Build top page/logs: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tx1-llvm-release…
Configuration details:
Reproduce builds:
<cut>
mkdir investigate-llvm-f96fef89b5eca29f2dc41e97829c20bf742cdcd9
cd investigate-llvm-f96fef89b5eca29f2dc41e97829c20bf742cdcd9
git clone https://git.linaro.org/toolchain/jenkins-scripts
mkdir -p artifacts/manifests
curl -o artifacts/manifests/build-baseline.sh https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tx1-llvm-release… --fail
curl -o artifacts/manifests/build-parameters.sh https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tx1-llvm-release… --fail
curl -o artifacts/test.sh https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tx1-llvm-release… --fail
chmod +x artifacts/test.sh
# Reproduce the baseline build (build all pre-requisites)
./jenkins-scripts/tcwg_bmk-build.sh @@ artifacts/manifests/build-baseline.sh
cd llvm
# Reproduce first_bad build
git checkout --detach f96fef89b5eca29f2dc41e97829c20bf742cdcd9
../artifacts/test.sh
# Reproduce last_good build
git checkout --detach 4926eed59c77bb452539d88a0a8ba3f3c21c4016
../artifacts/test.sh
cd ..
</cut>
History of pending regressions and results: https://git.linaro.org/toolchain/ci/base-artifacts.git/log/?h=linaro-local/…
Artifacts: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tx1-llvm-release…
Build log: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tx1-llvm-release…
Full commit (up to 1000 lines):
<cut>
commit f96fef89b5eca29f2dc41e97829c20bf742cdcd9
Author: Fangrui Song <i(a)maskray.me>
Date: Tue Nov 24 09:51:32 2020 -0800
[Driver] Default Generic_GCC aarch64 to -fasynchronous-unwind-tables
In GCC, `aarch64-*-linux` and `aarch64-*-freebsd` made the switch in 2018
(https://gcc.gnu.org/pipermail/gcc-patches/2018-March/495549.html).
In Clang, FreeBSD/Fuchsia/NetBSD/MinGW aarch64 default to -fasynchronous-unwind-tables.
This patch defaults Generic_GCC aarch64 (which affects Linux) to use -fasynchronous-unwind-tables.
Reviewed By: nickdesaulniers
Differential Revision: https://reviews.llvm.org/D91760
---
clang/lib/Driver/ToolChains/Gnu.cpp | 8 +++++++-
clang/test/Driver/aarch64-features.c | 2 ++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
index 7d75e90c6092..08158ba4bae8 100644
--- a/clang/lib/Driver/ToolChains/Gnu.cpp
+++ b/clang/lib/Driver/ToolChains/Gnu.cpp
@@ -2672,7 +2672,13 @@ void Generic_GCC::printVerboseInfo(raw_ostream &OS) const {
}
bool Generic_GCC::IsUnwindTablesDefault(const ArgList &Args) const {
- return getArch() == llvm::Triple::x86_64;
+ switch (getArch()) {
+ case llvm::Triple::aarch64:
+ case llvm::Triple::x86_64:
+ return true;
+ default:
+ return false;
+ }
}
bool Generic_GCC::isPICDefault() const {
diff --git a/clang/test/Driver/aarch64-features.c b/clang/test/Driver/aarch64-features.c
index 7c3f8754049a..8d8cc3c68afe 100644
--- a/clang/test/Driver/aarch64-features.c
+++ b/clang/test/Driver/aarch64-features.c
@@ -1,6 +1,8 @@
// RUN: %clang -target aarch64-none-linux-gnu -### %s -fsyntax-only 2>&1 | FileCheck %s
// RUN: %clang -target arm64-none-linux-gnu -### %s -fsyntax-only 2>&1 | FileCheck %s
+// CHECK: "-munwind-tables"
+
// The AArch64 PCS states that chars should be unsigned.
// CHECK: fno-signed-char
</cut>
3 years, 10 months
- 1
- 0
[CI-NOTIFY]: TCWG Bisect tcwg_bmk_tk1/llvm-release-arm-spec2k6-Os - Build # 16 - Successful!
by ci_notify＠linaro.org
Successfully identified regression in *gcc* in CI configuration tcwg_bmk_llvm_tk1/llvm-release-arm-spec2k6-Os. So far, this commit has regressed CI configurations:
- tcwg_bmk_llvm_tk1/llvm-release-arm-spec2k6-Os
Culprit:
<cut>
commit b6bf4d8a773cde07e751542f2911307d78b717fd
Author: Andreas Tobler <andreast(a)gcc.gnu.org>
Date: Thu Apr 25 22:03:35 2019 +0200
freebsd64.h: Add bits for 32-bit multilib support.
2019-04-25 Andreas Tobler <andreast(a)gcc.gnu.org>
* config/i386/freebsd64.h: Add bits for 32-bit multilib support.
* config/i386/t-freebsd64: New file.
* config.gcc: Add the t-freebsd64 for multilib support.
From-SVN: r270586
</cut>
Results regressed to (for first_bad == b6bf4d8a773cde07e751542f2911307d78b717fd)
# reset_artifacts:
-10
# build_abe binutils:
-9
# build_abe stage1 -- --set gcc_override_configure=--with-mode=thumb --set gcc_override_configure=--disable-libsanitizer:
-8
# build_abe linux:
-7
# build_abe glibc:
-6
# build_abe stage2 -- --set gcc_override_configure=--with-mode=thumb --set gcc_override_configure=--disable-libsanitizer:
-5
# build_llvm true:
-3
# true:
0
# benchmark -Os_mthumb -- artifacts/build-b6bf4d8a773cde07e751542f2911307d78b717fd/results_id:
1
# 429.mcf,mcf_base.default regressed by 104
# 470.lbm,lbm_base.default regressed by 103
from (for last_good == 8a55f9c57a1ffd900262aa2fc2015822dc059331)
# reset_artifacts:
-10
# build_abe binutils:
-9
# build_abe stage1 -- --set gcc_override_configure=--with-mode=thumb --set gcc_override_configure=--disable-libsanitizer:
-8
# build_abe linux:
-7
# build_abe glibc:
-6
# build_abe stage2 -- --set gcc_override_configure=--with-mode=thumb --set gcc_override_configure=--disable-libsanitizer:
-5
# build_llvm true:
-3
# true:
0
# benchmark -Os_mthumb -- artifacts/build-baseline/results_id:
1
Artifacts of last_good build: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tk1-llvm-release…
Results ID of last_good: tk1_32/tcwg_bmk_llvm_tk1/baseline-llvm-release-arm-spec2k6-Os/824
Artifacts of first_bad build: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tk1-llvm-release…
Results ID of first_bad: tk1_32/tcwg_bmk_llvm_tk1/bisect-llvm-release-arm-spec2k6-Os/929
Build top page/logs: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tk1-llvm-release…
Configuration details:
Reproduce builds:
<cut>
mkdir investigate-gcc-b6bf4d8a773cde07e751542f2911307d78b717fd
cd investigate-gcc-b6bf4d8a773cde07e751542f2911307d78b717fd
git clone https://git.linaro.org/toolchain/jenkins-scripts
mkdir -p artifacts/manifests
curl -o artifacts/manifests/build-baseline.sh https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tk1-llvm-release… --fail
curl -o artifacts/manifests/build-parameters.sh https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tk1-llvm-release… --fail
curl -o artifacts/test.sh https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tk1-llvm-release… --fail
chmod +x artifacts/test.sh
# Reproduce the baseline build (build all pre-requisites)
./jenkins-scripts/tcwg_bmk-build.sh @@ artifacts/manifests/build-baseline.sh
cd gcc
# Reproduce first_bad build
git checkout --detach b6bf4d8a773cde07e751542f2911307d78b717fd
../artifacts/test.sh
# Reproduce last_good build
git checkout --detach 8a55f9c57a1ffd900262aa2fc2015822dc059331
../artifacts/test.sh
cd ..
</cut>
History of pending regressions and results: https://git.linaro.org/toolchain/ci/base-artifacts.git/log/?h=linaro-local/…
Artifacts: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tk1-llvm-release…
Build log: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tk1-llvm-release…
Full commit (up to 1000 lines):
<cut>
commit b6bf4d8a773cde07e751542f2911307d78b717fd
Author: Andreas Tobler <andreast(a)gcc.gnu.org>
Date: Thu Apr 25 22:03:35 2019 +0200
freebsd64.h: Add bits for 32-bit multilib support.
2019-04-25 Andreas Tobler <andreast(a)gcc.gnu.org>
* config/i386/freebsd64.h: Add bits for 32-bit multilib support.
* config/i386/t-freebsd64: New file.
* config.gcc: Add the t-freebsd64 for multilib support.
From-SVN: r270586
---
gcc/ChangeLog | 6 ++++++
gcc/config.gcc | 5 ++++-
gcc/config/i386/freebsd64.h | 5 ++++-
gcc/config/i386/t-freebsd64 | 30 ++++++++++++++++++++++++++++++
4 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7cd02c850d3..3a927ed00d3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-04-25 Andreas Tobler <andreast(a)gcc.gnu.org>
+
+ * config/i386/freebsd64.h: Add bits for 32-bit multilib support.
+ * config/i386/t-freebsd64: New file.
+ * config.gcc: Add the t-freebsd64 for multilib support.
+
2019-04-25 Uroš Bizjak <ubizjak(a)gmail.com>
* doc/extend.texi (vector_size): Add missing comma after @xref.
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 09fb9ecd2cd..c7a464c89d0 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -4927,7 +4927,10 @@ case ${target} in
;;
i[34567]86-*-dragonfly* | x86_64-*-dragonfly*)
;;
- i[34567]86-*-freebsd* | x86_64-*-freebsd*)
+ i[34567]86-*-freebsd*)
+ ;;
+ x86_64-*-freebsd*)
+ tmake_file="${tmake_file} i386/t-freebsd64"
;;
ia64*-*-linux*)
;;
diff --git a/gcc/config/i386/freebsd64.h b/gcc/config/i386/freebsd64.h
index 1f99e812f01..bffe19c14ff 100644
--- a/gcc/config/i386/freebsd64.h
+++ b/gcc/config/i386/freebsd64.h
@@ -31,7 +31,7 @@ along with GCC; see the file COPYING3. If not see
#undef LINK_SPEC
#define LINK_SPEC "\
- %{m32:-m elf_i386_fbsd} \
+ %{m32:-m elf_i386_fbsd}%{!m32:-m elf_x86_64_fbsd} \
%{p:%nconsider using '-pg' instead of '-p' with gprof(1)} \
%{v:-V} \
%{assert*} %{R*} %{rpath*} %{defsym*} \
@@ -42,3 +42,6 @@ along with GCC; see the file COPYING3. If not see
-dynamic-linker %(fbsd_dynamic_linker) } \
%{static:-Bstatic}} \
%{symbolic:-Bsymbolic}"
+
+#undef MULTILIB_DEFAULTS
+#define MULTILIB_DEFAULTS { "m64" }
diff --git a/gcc/config/i386/t-freebsd64 b/gcc/config/i386/t-freebsd64
new file mode 100644
index 00000000000..0dd05d479ac
--- /dev/null
+++ b/gcc/config/i386/t-freebsd64
@@ -0,0 +1,30 @@
+# Copyright (C) 2019 Free Software Foundation, Inc.
+#
+# This file is part of GCC.
+#
+# GCC is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GCC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GCC; see the file COPYING3. If not see
+# <http://www.gnu.org/licenses/>.
+
+# The 32-bit libraries are found in /usr/lib32
+
+# To support i386 and x86-64, the directory structrue
+# should be:
+#
+# /lib has x86-64 libraries.
+# /lib32 has i386 libraries.
+#
+
+MULTILIB_OPTIONS = m32
+MULTILIB_DIRNAMES = 32
+MULTILIB_OSDIRNAMES = ../lib32
</cut>
3 years, 10 months
- 1
- 0
toolchain+qemu regression testing
by Richard Henderson
Hey, Maxim,
You recently mentioned we have such a setup working, yes? Is there an easy
way to point the qemu portion to a custom branch?
I'm currently working on adding vdso support to qemu, and want to make sure
that the unwind info that I've written works correctly with libgcc and
llvm's libunwind.
Also, what arm CPU models are being used? My edge cases are v4, v4t, m0
(which is not really linux-user, but I think Christophe Lyon had made work).
r~
3 years, 10 months
- 1
- 0
[CI-NOTIFY]: TCWG Bisect tcwg_bmk_tx1/llvm-release-aarch64-spec2k6-O3 - Build # 3 - Successful!
by ci_notify＠linaro.org
Successfully identified regression in *llvm* in CI configuration tcwg_bmk_llvm_tx1/llvm-release-aarch64-spec2k6-O3. So far, this commit has regressed CI configurations:
- tcwg_bmk_llvm_tx1/llvm-release-aarch64-spec2k6-O3
Culprit:
<cut>
commit 445db89b537e5397a2d4b08e79751edb845b2c2a
Author: Nikita Popov <nikita.ppv(a)gmail.com>
Date: Sun Sep 20 21:07:52 2020 +0200
[LVI] Get value range from mask comparison
InstCombine likes to canonicalize comparisons of the form
X == C || X == C+1 into (X & -2) == C'. Make sure LVI can still
recover the value range from this. Can of course also be useful
for proper mask comparisons.
For the sake of clarity, the implementation goes through KnownBits
to compute the range.
</cut>
Results regressed to (for first_bad == 445db89b537e5397a2d4b08e79751edb845b2c2a)
# reset_artifacts:
-10
# build_abe binutils:
-9
# build_abe stage1 -- --set gcc_override_configure=--disable-libsanitizer:
-8
# build_abe linux:
-7
# build_abe glibc:
-6
# build_abe stage2 -- --set gcc_override_configure=--disable-libsanitizer:
-5
# build_llvm true:
-3
# true:
0
# benchmark -O3 -- artifacts/build-445db89b537e5397a2d4b08e79751edb845b2c2a/results_id:
1
# 400.perlbench,perlbench_base.default regressed by 103
from (for last_good == 91af6a78d00f731826ff2eb81c9a9281b1d21388)
# reset_artifacts:
-10
# build_abe binutils:
-9
# build_abe stage1 -- --set gcc_override_configure=--disable-libsanitizer:
-8
# build_abe linux:
-7
# build_abe glibc:
-6
# build_abe stage2 -- --set gcc_override_configure=--disable-libsanitizer:
-5
# build_llvm true:
-3
# true:
0
# benchmark -O3 -- artifacts/build-91af6a78d00f731826ff2eb81c9a9281b1d21388/results_id:
1
Artifacts of last_good build: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tx1-llvm-release…
Results ID of last_good: tx1_64/tcwg_bmk_llvm_tx1/bisect-llvm-release-aarch64-spec2k6-O3/880
Artifacts of first_bad build: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tx1-llvm-release…
Results ID of first_bad: tx1_64/tcwg_bmk_llvm_tx1/bisect-llvm-release-aarch64-spec2k6-O3/890
Build top page/logs: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tx1-llvm-release…
Configuration details:
Reproduce builds:
<cut>
mkdir investigate-llvm-445db89b537e5397a2d4b08e79751edb845b2c2a
cd investigate-llvm-445db89b537e5397a2d4b08e79751edb845b2c2a
git clone https://git.linaro.org/toolchain/jenkins-scripts
mkdir -p artifacts/manifests
curl -o artifacts/manifests/build-baseline.sh https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tx1-llvm-release… --fail
curl -o artifacts/manifests/build-parameters.sh https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tx1-llvm-release… --fail
curl -o artifacts/test.sh https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tx1-llvm-release… --fail
chmod +x artifacts/test.sh
# Reproduce the baseline build (build all pre-requisites)
./jenkins-scripts/tcwg_bmk-build.sh @@ artifacts/manifests/build-baseline.sh
cd llvm
# Reproduce first_bad build
git checkout --detach 445db89b537e5397a2d4b08e79751edb845b2c2a
../artifacts/test.sh
# Reproduce last_good build
git checkout --detach 91af6a78d00f731826ff2eb81c9a9281b1d21388
../artifacts/test.sh
cd ..
</cut>
History of pending regressions and results: https://git.linaro.org/toolchain/ci/base-artifacts.git/log/?h=linaro-local/…
Artifacts: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tx1-llvm-release…
Build log: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tx1-llvm-release…
Full commit (up to 1000 lines):
<cut>
commit 445db89b537e5397a2d4b08e79751edb845b2c2a
Author: Nikita Popov <nikita.ppv(a)gmail.com>
Date: Sun Sep 20 21:07:52 2020 +0200
[LVI] Get value range from mask comparison
InstCombine likes to canonicalize comparisons of the form
X == C || X == C+1 into (X & -2) == C'. Make sure LVI can still
recover the value range from this. Can of course also be useful
for proper mask comparisons.
For the sake of clarity, the implementation goes through KnownBits
to compute the range.
---
llvm/lib/Analysis/LazyValueInfo.cpp | 14 ++++++++++++++
.../test/Transforms/CorrelatedValuePropagation/icmp.ll | 18 ++++++------------
2 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/llvm/lib/Analysis/LazyValueInfo.cpp b/llvm/lib/Analysis/LazyValueInfo.cpp
index 4e9505a12cb8..cc364fc93337 100644
--- a/llvm/lib/Analysis/LazyValueInfo.cpp
+++ b/llvm/lib/Analysis/LazyValueInfo.cpp
@@ -36,6 +36,7 @@
#include "llvm/InitializePasses.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/FormattedStream.h"
+#include "llvm/Support/KnownBits.h"
#include "llvm/Support/raw_ostream.h"
#include <map>
using namespace llvm;
@@ -1145,6 +1146,19 @@ static ValueLatticeElement getValueFromICmpCondition(Value *Val, ICmpInst *ICI,
if (matchICmpOperand(Offset, RHS, Val, SwappedPred))
return getValueFromSimpleICmpCondition(SwappedPred, LHS, Offset);
+ // If (Val & Mask) == C then all the masked bits are known and we can compute
+ // a value range based on that.
+ const APInt *Mask, *C;
+ if (EdgePred == ICmpInst::ICMP_EQ &&
+ match(LHS, m_And(m_Specific(Val), m_APInt(Mask))) &&
+ match(RHS, m_APInt(C))) {
+ KnownBits Known;
+ Known.Zero = ~*C & *Mask;
+ Known.One = *C & *Mask;
+ return ValueLatticeElement::getRange(
+ ConstantRange::fromKnownBits(Known, /*IsSigned*/ false));
+ }
+
return ValueLatticeElement::getOverdefined();
}
diff --git a/llvm/test/Transforms/CorrelatedValuePropagation/icmp.ll b/llvm/test/Transforms/CorrelatedValuePropagation/icmp.ll
index 76d8e0d00f70..cdc5140b6548 100644
--- a/llvm/test/Transforms/CorrelatedValuePropagation/icmp.ll
+++ b/llvm/test/Transforms/CorrelatedValuePropagation/icmp.ll
@@ -995,14 +995,10 @@ define void @test_icmp_mask_two_values(i32 %a) {
; CHECK-NEXT: [[CMP:%.*]] = icmp eq i32 [[AND]], 10
; CHECK-NEXT: br i1 [[CMP]], label [[IF_TRUE:%.*]], label [[IF_FALSE:%.*]]
; CHECK: if.true:
-; CHECK-NEXT: [[CMP2:%.*]] = icmp uge i32 [[A]], 10
-; CHECK-NEXT: call void @check1(i1 [[CMP2]])
-; CHECK-NEXT: [[CMP3:%.*]] = icmp ule i32 [[A]], 11
-; CHECK-NEXT: call void @check1(i1 [[CMP3]])
-; CHECK-NEXT: [[CMP4:%.*]] = icmp ult i32 [[A]], 10
-; CHECK-NEXT: call void @check1(i1 [[CMP4]])
-; CHECK-NEXT: [[CMP5:%.*]] = icmp ugt i32 [[A]], 11
-; CHECK-NEXT: call void @check1(i1 [[CMP5]])
+; CHECK-NEXT: call void @check1(i1 true)
+; CHECK-NEXT: call void @check1(i1 true)
+; CHECK-NEXT: call void @check1(i1 false)
+; CHECK-NEXT: call void @check1(i1 false)
; CHECK-NEXT: ret void
; CHECK: if.false:
; CHECK-NEXT: ret void
@@ -1032,8 +1028,7 @@ define void @test_icmp_mask_bit_set(i32 %a) {
; CHECK-NEXT: [[CMP:%.*]] = icmp eq i32 [[AND]], 32
; CHECK-NEXT: br i1 [[CMP]], label [[IF_TRUE:%.*]], label [[IF_FALSE:%.*]]
; CHECK: if.true:
-; CHECK-NEXT: [[CMP2:%.*]] = icmp uge i32 [[A]], 32
-; CHECK-NEXT: call void @check1(i1 [[CMP2]])
+; CHECK-NEXT: call void @check1(i1 true)
; CHECK-NEXT: [[CMP3:%.*]] = icmp uge i32 [[A]], 33
; CHECK-NEXT: call void @check1(i1 [[CMP3]])
; CHECK-NEXT: ret void
@@ -1061,8 +1056,7 @@ define void @test_icmp_mask_bit_unset(i32 %a) {
; CHECK-NEXT: [[CMP:%.*]] = icmp eq i32 [[AND]], 0
; CHECK-NEXT: br i1 [[CMP]], label [[IF_TRUE:%.*]], label [[IF_FALSE:%.*]]
; CHECK: if.true:
-; CHECK-NEXT: [[CMP2:%.*]] = icmp ule i32 [[A]], -33
-; CHECK-NEXT: call void @check1(i1 [[CMP2]])
+; CHECK-NEXT: call void @check1(i1 true)
; CHECK-NEXT: [[CMP3:%.*]] = icmp ule i32 [[A]], -34
; CHECK-NEXT: call void @check1(i1 [[CMP3]])
; CHECK-NEXT: ret void
</cut>
3 years, 10 months
- 1
- 0
[CI-NOTIFY]: TCWG Bisect tcwg_gnu/gnu-master-arm-check_bootstrap - Build # 68 - Successful!
by ci_notify＠linaro.org
Successfully identified regression in *gcc* in CI configuration tcwg_gnu/gnu-master-arm-check_bootstrap. So far, this commit has regressed CI configurations:
- tcwg_gnu/gnu-master-arm-check_bootstrap
Culprit:
<cut>
commit 095a01cf6e3883b3083cf339b680cdb39910f529
Author: David Edelsohn <dje.gcc(a)gmail.com>
Date: Mon Jun 28 22:54:42 2021 -0400
bootstrap: Include tm_p.h in btfout.c and ctfout.c.
btfout.c and ctfout.c reference target-specific macros that
may reference target-specific functions that are declared in a
target-specific header. tm_p.h must be included to provide the
target-specific header.
gcc/ChangeLog:
* btfout.c: Include tm_p.h.
* ctfout.c: Same.
</cut>
Results regressed to (for first_bad == 095a01cf6e3883b3083cf339b680cdb39910f529)
# reset_artifacts:
-10
# build_abe bootstrap:
0
# build_abe check_bootstrap:
1
# # Comparing directories
# # REFERENCE: base-artifacts/sumfiles
# # CURRENT: /home/tcwg-buildslave/workspace/tcwg_gnu_3/artifacts/build-095a01cf6e3883b3083cf339b680cdb39910f529/sumfiles
#
# # Comparing 12 common sum files:
# g++.sum
# gcc.sum
# gfortran.sum
# go.sum
# gotools.sum
# libatomic.sum
# libffi.sum
# libgo.sum
# libgomp.sum
# libitm.sum
# libstdc++.sum
# objc.sum
# Comparing:
# REFERENCE:/tmp/gxx-sum1.2252296
# CURRENT: /tmp/gxx-sum2.2252296
#
# ` +---------+---------+
# o RUN STATUS: | REF | RES |
# +------------------------------------------+---------+---------+
# | Passes [PASS] | 460490 | 460509 |
# | Unexpected fails [FAIL] | 192 | 193 |
# | Errors [ERROR] | 0 | 0 |
# | Unexpected passes [XPASS] | 15 | 15 |
# | Expected fails [XFAIL] | 2737 | 2737 |
# | Unresolved [UNRESOLVED] | 104 | 104 |
# | Unsupported [UNSUPPORTED] | 22896 | 22896 |
# | Untested [UNTESTED] | 10 | 10 |
# +------------------------------------------+---------+---------+
#
# REF PASS ratio: 0.952272
# RES PASS ratio: 0.952272
#
# o REGRESSIONS:
# +------------------------------------------+---------+
# | PASS now FAIL [PASS => FAIL] | 1 |
# +------------------------------------------+---------+
# | TOTAL_REGRESSIONS | 1 |
# +------------------------------------------+---------+
#
# - PASS now FAIL [PASS => FAIL]:
#
# Executed from: go.test/go-test.exp
# go:go.test/test/fixedbugs/issue13160.go execution, -O2 -g
#
#
#
# o IMPROVEMENTS TO BE CHECKED:
# +------------------------------------------+---------+
# | New PASS [ => PASS] | 20 |
# +------------------------------------------+---------+
# | TOTAL_IMPROVEMENTS_TO_BE_CHECKED | 20 |
# +------------------------------------------+---------+
#
# - New PASS [ => PASS]:
#
# Executed from: g++.dg/dg.exp
# g++:g++.dg/uninit-pr74762.C -std=gnu++14 (test for warnings, line 23)
# g++:g++.dg/uninit-pr74762.C -std=gnu++14 (test for excess errors)
# g++:g++.dg/uninit-pr74762.C -std=gnu++17 (test for warnings, line 23)
# g++:g++.dg/uninit-pr74762.C -std=gnu++17 (test for excess errors)
# g++:g++.dg/uninit-pr74762.C -std=gnu++2a (test for warnings, line 23)
# g++:g++.dg/uninit-pr74762.C -std=gnu++2a (test for excess errors)
# g++:g++.dg/uninit-pr74762.C -std=gnu++98 (test for warnings, line 23)
# g++:g++.dg/uninit-pr74762.C -std=gnu++98 (test for excess errors)
# g++:g++.dg/warn/uninit-pr74765.C -std=gnu++14 (test for warnings, line 10)
# g++:g++.dg/warn/uninit-pr74765.C -std=gnu++14 (test for warnings, line 20)
# g++:g++.dg/warn/uninit-pr74765.C -std=gnu++14 (test for excess errors)
# g++:g++.dg/warn/uninit-pr74765.C -std=gnu++17 (test for warnings, line 10)
# g++:g++.dg/warn/uninit-pr74765.C -std=gnu++17 (test for warnings, line 20)
# g++:g++.dg/warn/uninit-pr74765.C -std=gnu++17 (test for excess errors)
# g++:g++.dg/warn/uninit-pr74765.C -std=gnu++2a (test for warnings, line 10)
# g++:g++.dg/warn/uninit-pr74765.C -std=gnu++2a (test for warnings, line 20)
# g++:g++.dg/warn/uninit-pr74765.C -std=gnu++2a (test for excess errors)
# g++:g++.dg/warn/uninit-pr74765.C -std=gnu++98 (test for warnings, line 10)
# g++:g++.dg/warn/uninit-pr74765.C -std=gnu++98 (test for warnings, line 20)
# g++:g++.dg/warn/uninit-pr74765.C -std=gnu++98 (test for excess errors)
#
#
#
# # Regressions found
# # Regressions in 12 common sum files found
from (for last_good == c8abc2058e96dd12454078d66be9982dfebfd154)
# reset_artifacts:
-10
# build_abe bootstrap:
0
# build_abe check_bootstrap:
1
Artifacts of last_good build: https://ci.linaro.org/job/tcwg_gcc-bisect-gnu-master-arm-check_bootstrap/68…
Artifacts of first_bad build: https://ci.linaro.org/job/tcwg_gcc-bisect-gnu-master-arm-check_bootstrap/68…
Build top page/logs: https://ci.linaro.org/job/tcwg_gcc-bisect-gnu-master-arm-check_bootstrap/68/
Configuration details:
Reproduce builds:
<cut>
mkdir investigate-gcc-095a01cf6e3883b3083cf339b680cdb39910f529
cd investigate-gcc-095a01cf6e3883b3083cf339b680cdb39910f529
git clone https://git.linaro.org/toolchain/jenkins-scripts
mkdir -p artifacts/manifests
curl -o artifacts/manifests/build-baseline.sh https://ci.linaro.org/job/tcwg_gcc-bisect-gnu-master-arm-check_bootstrap/68… --fail
curl -o artifacts/manifests/build-parameters.sh https://ci.linaro.org/job/tcwg_gcc-bisect-gnu-master-arm-check_bootstrap/68… --fail
curl -o artifacts/test.sh https://ci.linaro.org/job/tcwg_gcc-bisect-gnu-master-arm-check_bootstrap/68… --fail
chmod +x artifacts/test.sh
# Reproduce the baseline build (build all pre-requisites)
./jenkins-scripts/tcwg_gnu-build.sh @@ artifacts/manifests/build-baseline.sh
cd gcc
# Reproduce first_bad build
git checkout --detach 095a01cf6e3883b3083cf339b680cdb39910f529
../artifacts/test.sh
# Reproduce last_good build
git checkout --detach c8abc2058e96dd12454078d66be9982dfebfd154
../artifacts/test.sh
cd ..
</cut>
History of pending regressions and results: https://git.linaro.org/toolchain/ci/base-artifacts.git/log/?h=linaro-local/…
Artifacts: https://ci.linaro.org/job/tcwg_gcc-bisect-gnu-master-arm-check_bootstrap/68…
Build log: https://ci.linaro.org/job/tcwg_gcc-bisect-gnu-master-arm-check_bootstrap/68…
Full commit (up to 1000 lines):
<cut>
commit 095a01cf6e3883b3083cf339b680cdb39910f529
Author: David Edelsohn <dje.gcc(a)gmail.com>
Date: Mon Jun 28 22:54:42 2021 -0400
bootstrap: Include tm_p.h in btfout.c and ctfout.c.
btfout.c and ctfout.c reference target-specific macros that
may reference target-specific functions that are declared in a
target-specific header. tm_p.h must be included to provide the
target-specific header.
gcc/ChangeLog:
* btfout.c: Include tm_p.h.
* ctfout.c: Same.
---
gcc/btfout.c | 1 +
gcc/ctfout.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/gcc/btfout.c b/gcc/btfout.c
index 45954b4b7b9..2316dea5f27 100644
--- a/gcc/btfout.c
+++ b/gcc/btfout.c
@@ -26,6 +26,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "target.h"
+#include "tm_p.h"
#include "output.h"
#include "dwarf2asm.h"
#include "debug.h"
diff --git a/gcc/ctfout.c b/gcc/ctfout.c
index c264fd6661a..71d7a62e6ef 100644
--- a/gcc/ctfout.c
+++ b/gcc/ctfout.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "target.h"
+#include "tm_p.h"
#include "output.h"
#include "dwarf2asm.h"
#include "debug.h"
</cut>
3 years, 10 months
- 2
- 1
[ACTIVITY] report week ending 2 Jul
by Peter Maydell
Progress:
* UM-2 [QEMU upstream maintainership]
+ Code review:
- RTH's latest bswap series
- RTH's series converting nios2 to TranslatorOps
- Alex's SYS_HEAPINFO series
- RTH's series to avoid linux-user putting signal trampoline code
on the stack
- Renesas SCI device refactoring
+ Working on making the docs report the license, version, etc in each
page's footer (something I was asked for back when I did the initial
conversion to Sphinx and which I promised I would do afterwards...)
+ Investigated a bug reported by Maxim Uvarov where the virt board's
GPIO-driven shutdown/reset mechanism for secure firmware wasn't
working correctly. This turns out to be caused by our PL061 GPIO
implementation hardcoding that GPIO lines have pullup resistors,
whereas the virt board and the gpio-pwr device implicitly assume
pulldown. That bug was then masked/confused by a second bug, where
we only actually signal the line level implied by the pullup when
the guest first touches the PL061, rather than on reset. Sent a
series that fixes both of these things (and does a bit of other
PL061 cleanup in the process).
* QEMU-406 [QEMU support for MVE (M-profile Vector Extension; Helium)]
+ Implemented all the non-vector shift insns
+ Sent out a second slice of patches for review
+ Progress: 112/210 (53%)
-- PMM
3 years, 10 months
- 1
- 0
[CI-NOTIFY]: TCWG Bisect tcwg_gnu/gnu-master-arm-check_bootstrap - Build # 67 - Successful!
by ci_notify＠linaro.org
Successfully identified regression in *gcc* in CI configuration tcwg_gnu/gnu-master-arm-check_bootstrap. So far, this commit has regressed CI configurations:
- tcwg_gnu/gnu-master-arm-check_bootstrap
Culprit:
<cut>
commit c1f76af469388d3df815c82de566387da5ae000f
Author: Indu Bhagat <indu.bhagat(a)oracle.com>
Date: Thu May 20 11:19:04 2021 -0700
CTF/BTF testsuites
This commit adds a new testsuite for the CTF debug format.
2021-06-28 Indu Bhagat <indu.bhagat(a)oracle.com>
David Faust <david.faust(a)oracle.com>
gcc/testsuite/
* lib/gcc-dg.exp (gcc-dg-frontend-supports-ctf): New procedure.
(gcc-dg-debug-runtest): Add -gctf support.
* gcc.dg/debug/btf/btf-1.c: New test.
* gcc.dg/debug/btf/btf-2.c: Likewise.
* gcc.dg/debug/btf/btf-anonymous-struct-1.c: Likewise.
* gcc.dg/debug/btf/btf-anonymous-union-1.c: Likewise.
* gcc.dg/debug/btf/btf-array-1.c: Likewise.
* gcc.dg/debug/btf/btf-bitfields-1.c: Likewise.
* gcc.dg/debug/btf/btf-bitfields-2.c: Likewise.
* gcc.dg/debug/btf/btf-bitfields-3.c: Likewise.
* gcc.dg/debug/btf/btf-cvr-quals-1.c: Likewise.
* gcc.dg/debug/btf/btf-enum-1.c: Likewise.
* gcc.dg/debug/btf/btf-forward-1.c: Likewise.
* gcc.dg/debug/btf/btf-function-1.c: Likewise.
* gcc.dg/debug/btf/btf-function-2.c: Likewise.
* gcc.dg/debug/btf/btf-int-1.c: Likewise.
* gcc.dg/debug/btf/btf-pointers-1.c: Likewise.
* gcc.dg/debug/btf/btf-struct-1.c: Likewise.
* gcc.dg/debug/btf/btf-typedef-1.c: Likewise.
* gcc.dg/debug/btf/btf-union-1.c: Likewise.
* gcc.dg/debug/btf/btf-variables-1.c: Likewise.
* gcc.dg/debug/btf/btf.exp: Likewise.
* gcc.dg/debug/ctf/ctf-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-2.c: Likewise.
* gcc.dg/debug/ctf/ctf-anonymous-struct-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-anonymous-union-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-array-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-array-2.c: Likewise.
* gcc.dg/debug/ctf/ctf-array-3.c: Likewise.
* gcc.dg/debug/ctf/ctf-array-4.c: Likewise.
* gcc.dg/debug/ctf/ctf-attr-mode-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-attr-used-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-bitfields-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-bitfields-2.c: Likewise.
* gcc.dg/debug/ctf/ctf-bitfields-3.c: Likewise.
* gcc.dg/debug/ctf/ctf-bitfields-4.c: Likewise.
* gcc.dg/debug/ctf/ctf-complex-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-cvr-quals-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-cvr-quals-2.c: Likewise.
* gcc.dg/debug/ctf/ctf-cvr-quals-3.c: Likewise.
* gcc.dg/debug/ctf/ctf-cvr-quals-4.c: Likewise.
* gcc.dg/debug/ctf/ctf-enum-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-enum-2.c: Likewise.
* gcc.dg/debug/ctf/ctf-file-scope-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-float-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-forward-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-forward-2.c: Likewise.
* gcc.dg/debug/ctf/ctf-func-index-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-function-pointers-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-function-pointers-2.c: Likewise.
* gcc.dg/debug/ctf/ctf-function-pointers-3.c: Likewise.
* gcc.dg/debug/ctf/ctf-functions-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-int-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-objt-index-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-pointers-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-pointers-2.c: Likewise.
* gcc.dg/debug/ctf/ctf-preamble-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-skip-types-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-skip-types-2.c: Likewise.
* gcc.dg/debug/ctf/ctf-skip-types-3.c: Likewise.
* gcc.dg/debug/ctf/ctf-skip-types-4.c: Likewise.
* gcc.dg/debug/ctf/ctf-skip-types-5.c: Likewise.
* gcc.dg/debug/ctf/ctf-skip-types-6.c: Likewise.
* gcc.dg/debug/ctf/ctf-str-table-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-struct-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-struct-2.c: Likewise.
* gcc.dg/debug/ctf/ctf-struct-array-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-struct-pointer-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-struct-pointer-2.c: Likewise.
* gcc.dg/debug/ctf/ctf-typedef-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-typedef-2.c: Likewise.
* gcc.dg/debug/ctf/ctf-typedef-3.c: Likewise.
* gcc.dg/debug/ctf/ctf-typedef-struct-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-typedef-struct-2.c: Likewise.
* gcc.dg/debug/ctf/ctf-typedef-struct-3.c: Likewise.
* gcc.dg/debug/ctf/ctf-union-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-variables-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-variables-2.c: Likewise.
* gcc.dg/debug/ctf/ctf.exp: Likewise.
</cut>
Results regressed to (for first_bad == c1f76af469388d3df815c82de566387da5ae000f)
# reset_artifacts:
-10
# build_abe bootstrap:
0
# build_abe check_bootstrap:
1
# # Comparing directories
# # REFERENCE: base-artifacts/sumfiles
# # CURRENT: /home/tcwg-buildslave/workspace/tcwg_gnu_3/artifacts/build-c1f76af469388d3df815c82de566387da5ae000f/sumfiles
#
# # Comparing 12 common sum files:
# g++.sum
# gcc.sum
# gfortran.sum
# go.sum
# gotools.sum
# libatomic.sum
# libffi.sum
# libgo.sum
# libgomp.sum
# libitm.sum
# libstdc++.sum
# objc.sum
# Comparing:
# REFERENCE:/tmp/gxx-sum1.3784533
# CURRENT: /tmp/gxx-sum2.3784533
#
# ` +---------+---------+
# o RUN STATUS: | REF | RES |
# +------------------------------------------+---------+---------+
# | Passes [PASS] | 460026 | 460487 |
# | Unexpected fails [FAIL] | 192 | 195 |
# | Errors [ERROR] | 0 | 0 |
# | Unexpected passes [XPASS] | 15 | 15 |
# | Expected fails [XFAIL] | 2737 | 2737 |
# | Unresolved [UNRESOLVED] | 104 | 104 |
# | Unsupported [UNSUPPORTED] | 22890 | 22896 |
# | Untested [UNTESTED] | 10 | 10 |
# +------------------------------------------+---------+---------+
#
# REF PASS ratio: 0.952238
# RES PASS ratio: 0.952266
#
# o REGRESSIONS:
# +------------------------------------------+---------+
# | PASS now FAIL [PASS => FAIL] | 1 |
# | FAIL appears [ => FAIL] | 2 |
# +------------------------------------------+---------+
# | TOTAL_REGRESSIONS | 3 |
# +------------------------------------------+---------+
#
# - PASS now FAIL [PASS => FAIL]:
#
# Executed from: g++.dg/dg.exp
# g++:c-c++-common/missing-header-1.c -std=gnu++14 (test for excess errors)
#
#
# - FAIL appears [ => FAIL]:
#
# Executed from: g++.dg/dg.exp
# g++:c-c++-common/missing-header-1.c -std=gnu++14 expected multiline pattern lines 5-7 not found: "\s*#include "this-file-does-not-exist\.h".*\n \^~~~~~~~~~~~~~~~~~~~~~~~~~~~\ncompilation terminated\..*\n"
# Executed from: gcc.dg/debug/ctf/ctf.exp
# gcc:gcc.dg/debug/ctf/ctf-skip-types-2.c (test for excess errors)
#
#
#
# o IMPROVEMENTS TO BE CHECKED:
# +------------------------------------------+---------+
# | PASS disappears [PASS => ] | 1 |
# | New PASS [ => PASS] | 463 |
# | UNSUPPORTED appears [ =>UNSUP] | 6 |
# +------------------------------------------+---------+
# | TOTAL_IMPROVEMENTS_TO_BE_CHECKED | 470 |
# +------------------------------------------+---------+
#
# - PASS disappears [PASS => ]:
#
# Executed from: g++.dg/dg.exp
# g++:c-c++-common/missing-header-1.c -std=gnu++14 expected multiline pattern lines 5-7 was found: "\s*#include "this-file-does-not-exist\.h".*\n \^~~~~~~~~~~~~~~~~~~~~~~~~~~~\ncompilation terminated\..*\n"
#
#
# - New PASS [ => PASS]:
#
# Executed from: g++.dg/dg.exp
# g++:g++.dg/ipa/ipa-sra-4.C -std=gnu++14 (test for excess errors)
# g++:g++.dg/ipa/ipa-sra-4.C -std=gnu++17 (test for excess errors)
# g++:g++.dg/ipa/ipa-sra-4.C -std=gnu++2a (test for excess errors)
# Executed from: gcc.dg/debug/debug.exp
# gcc:gcc.dg/debug/20000503-1.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/20010207-1.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/20011223-1.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/20020104-2.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/20020220-1.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/20020220-1.c -gctf execution test
# gcc:gcc.dg/debug/20020224-1.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/20020327-1.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/20030605-1.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/20031231-1.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/20041023-1.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/20041219-1.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/20050907-1.c -gctf (test for excess errors)
# Executed from: gcc.dg/debug/btf/btf.exp
# gcc:gcc.dg/debug/btf/btf-1.c (test for excess errors)
# gcc:gcc.dg/debug/btf/btf-2.c (test for excess errors)
# gcc:gcc.dg/debug/btf/btf-2.c scan-assembler-times 0.*btf_flags 1
# gcc:gcc.dg/debug/btf/btf-2.c scan-assembler-times 0x1.*btf_version 1
# gcc:gcc.dg/debug/btf/btf-2.c scan-assembler-times 0xeb9f.*btf_magic 1
# gcc:gcc.dg/debug/btf/btf-anonymous-struct-1.c (test for excess errors)
# gcc:gcc.dg/debug/btf/btf-anonymous-struct-1.c scan-assembler-times [\t ]0[\t ]+[^\n]*btt_name 1
# gcc:gcc.dg/debug/btf/btf-anonymous-struct-1.c scan-assembler-times [\t ]0x4000001[\t ]+[^\n]*btt_info 1
# gcc:gcc.dg/debug/btf/btf-anonymous-struct-1.c scan-assembler-times [\t ]0x4000002[\t ]+[^\n]*btt_info 1
# gcc:gcc.dg/debug/btf/btf-anonymous-union-1.c (test for excess errors)
# gcc:gcc.dg/debug/btf/btf-anonymous-union-1.c scan-assembler-times [\t ]0[\t ]+[^\n]*btt_name 1
# gcc:gcc.dg/debug/btf/btf-anonymous-union-1.c scan-assembler-times [\t ]0x4000001[\t ]+[^\n]*btt_info 1
# gcc:gcc.dg/debug/btf/btf-anonymous-union-1.c scan-assembler-times [\t ]0x5000002[\t ]+[^\n]*btt_info 1
# gcc:gcc.dg/debug/btf/btf-array-1.c (test for excess errors)
# gcc:gcc.dg/debug/btf/btf-array-1.c scan-assembler-times 0x3000000[\t ]+[^\n]*btt_info 5
# gcc:gcc.dg/debug/btf/btf-array-1.c scan-assembler-times [\t ]0[\t ]+[^\n]*bta_nelems 1
# gcc:gcc.dg/debug/btf/btf-array-1.c scan-assembler-times [\t ]0x2[\t ]+[^\n]*bta_nelems 2
# gcc:gcc.dg/debug/btf/btf-array-1.c scan-assembler-times [\t ]0x3[\t ]+[^\n]*bta_nelems 1
# gcc:gcc.dg/debug/btf/btf-array-1.c scan-assembler-times [\t ]0x5[\t ]+[^\n]*bta_nelems 1
# gcc:gcc.dg/debug/btf/btf-bitfields-1.c (test for excess errors)
# gcc:gcc.dg/debug/btf/btf-bitfields-1.c scan-assembler-times [\t ]0x13000040[\t ]+[^\n]*btm_offset 1
# gcc:gcc.dg/debug/btf/btf-bitfields-1.c scan-assembler-times [\t ]0x700002a[\t ]+[^\n]*btm_offset 1
# gcc:gcc.dg/debug/btf/btf-bitfields-1.c scan-assembler-times [\t ]0x84000004[\t ]+[^\n]*btt_info 1
# gcc:gcc.dg/debug/btf/btf-bitfields-1.c scan-assembler-times [\t ]0xa000020[\t ]+[^\n]*btm_offset 1
# gcc:gcc.dg/debug/btf/btf-bitfields-2.c (test for excess errors)
# gcc:gcc.dg/debug/btf/btf-bitfields-2.c scan-assembler-times [\t ]0x1f000000[\t ]+[^\n]*btm_offset 1
# gcc:gcc.dg/debug/btf/btf-bitfields-2.c scan-assembler-times [\t ]0x20000020[\t ]+[^\n]*btm_offset 1
# gcc:gcc.dg/debug/btf/btf-bitfields-2.c scan-assembler-times [\t ]0x84000002[\t ]+[^\n]*btt_info 1
# gcc:gcc.dg/debug/btf/btf-bitfields-2.c scan-assembler-times btm_name 2
# gcc:gcc.dg/debug/btf/btf-bitfields-3.c (test for excess errors)
# gcc:gcc.dg/debug/btf/btf-bitfields-3.c scan-assembler-times [\t ]0x1[\t ]+[^\n]*btm_type 1
# gcc:gcc.dg/debug/btf/btf-bitfields-3.c scan-assembler-times [\t ]0x2[\t ]+[^\n]*btm_type 1
# gcc:gcc.dg/debug/btf/btf-bitfields-3.c scan-assembler-times [\t ]0x6000004[\t ]+[^\n]*btt_info 1
# gcc:gcc.dg/debug/btf/btf-bitfields-3.c scan-assembler-times [\t ]0x84000002[\t ]+[^\n]*btt_info 1
# gcc:gcc.dg/debug/btf/btf-bitfields-4.c (test for excess errors)
# gcc:gcc.dg/debug/btf/btf-bitfields-4.c scan-assembler-times [\t ]0x4000003[\t ]+[^\n]*btt_info 1
# gcc:gcc.dg/debug/btf/btf-cvr-quals-1.c (test for excess errors)
# gcc:gcc.dg/debug/btf/btf-cvr-quals-1.c scan-assembler-times [\t ]0x2000000[\t ]+[^\n]*btt_info 2
# gcc:gcc.dg/debug/btf/btf-cvr-quals-1.c scan-assembler-times [\t ]0x9000000[\t ]+[^\n]*btt_info 1
# gcc:gcc.dg/debug/btf/btf-cvr-quals-1.c scan-assembler-times [\t ]0xa000000[\t ]+[^\n]*btt_info 2
# gcc:gcc.dg/debug/btf/btf-cvr-quals-1.c scan-assembler-times [\t ]0xb000000[\t ]+[^\n]*btt_info 2
# gcc:gcc.dg/debug/btf/btf-cvr-quals-1.c scan-assembler-times ascii "int.0"[\t ]+[^\n]*btf_string 1
# gcc:gcc.dg/debug/btf/btf-datasec-1.c (test for excess errors)
# gcc:gcc.dg/debug/btf/btf-datasec-1.c scan-assembler-times 0[\t ]+[^\n]*bts_offset 7
# gcc:gcc.dg/debug/btf/btf-datasec-1.c scan-assembler-times 0xf000001[\t ]+[^\n]*btt_info 1
# gcc:gcc.dg/debug/btf/btf-datasec-1.c scan-assembler-times 0xf000003[\t ]+[^\n]*btt_info 2
# gcc:gcc.dg/debug/btf/btf-datasec-1.c scan-assembler-times ascii ".bss.0"[\t ]+[^\n]*btf_aux_string 1
# gcc:gcc.dg/debug/btf/btf-datasec-1.c scan-assembler-times ascii ".data.0"[\t ]+[^\n]*btf_aux_string 1
# gcc:gcc.dg/debug/btf/btf-datasec-1.c scan-assembler-times ascii ".rodata.0"[\t ]+[^\n]*btf_aux_string 1
# gcc:gcc.dg/debug/btf/btf-enum-1.c (test for excess errors)
# gcc:gcc.dg/debug/btf/btf-enum-1.c scan-assembler-times [\t ]0x6000003[\t ]+[^\n]*btt_info 1
# gcc:gcc.dg/debug/btf/btf-enum-1.c scan-assembler-times [\t ]0x6000004[\t ]+[^\n]*btt_info 1
# gcc:gcc.dg/debug/btf/btf-enum-1.c scan-assembler-times ascii "IDUNNO.0"[\t ]+[^\n]*btf_string 1
# gcc:gcc.dg/debug/btf/btf-enum-1.c scan-assembler-times ascii "NO.0"[\t ]+[^\n]*btf_string 1
# gcc:gcc.dg/debug/btf/btf-enum-1.c scan-assembler-times ascii "QAD.0"[\t ]+[^\n]*btf_string 1
# gcc:gcc.dg/debug/btf/btf-enum-1.c scan-assembler-times ascii "QED.0"[\t ]+[^\n]*btf_string 1
# gcc:gcc.dg/debug/btf/btf-enum-1.c scan-assembler-times ascii "QOD.0"[\t ]+[^\n]*btf_string 1
# gcc:gcc.dg/debug/btf/btf-enum-1.c scan-assembler-times ascii "QUD.0"[\t ]+[^\n]*btf_string 1
# gcc:gcc.dg/debug/btf/btf-enum-1.c scan-assembler-times ascii "YES.0"[\t ]+[^\n]*btf_string 1
# gcc:gcc.dg/debug/btf/btf-enum-1.c scan-assembler-times bte_value 7
# gcc:gcc.dg/debug/btf/btf-forward-1.c (test for excess errors)
# gcc:gcc.dg/debug/btf/btf-forward-1.c scan-assembler-times [\t ]0x7000000[\t ]+[^\n]*btt_info 1
# gcc:gcc.dg/debug/btf/btf-forward-1.c scan-assembler-times [\t ]0x87000000[\t ]+[^\n]*btt_info 1
# gcc:gcc.dg/debug/btf/btf-function-1.c (test for excess errors)
# gcc:gcc.dg/debug/btf/btf-function-1.c scan-assembler-times [\t ]0xd000002[\t ]+[^\n]*btt_info 1
# gcc:gcc.dg/debug/btf/btf-function-1.c scan-assembler-times ascii "alpha.0"[\t ]+[^\n]*btf_aux_string 1
# gcc:gcc.dg/debug/btf/btf-function-1.c scan-assembler-times ascii "bravo.0"[\t ]+[^\n]*btf_aux_string 1
# gcc:gcc.dg/debug/btf/btf-function-1.c scan-assembler-times farg_name 2
# gcc:gcc.dg/debug/btf/btf-function-1.c scan-assembler-times farg_type 2
# gcc:gcc.dg/debug/btf/btf-function-2.c (test for excess errors)
# gcc:gcc.dg/debug/btf/btf-function-2.c scan-assembler-times [\t ]0[\t ]+[^\n]*farg_name 1
# gcc:gcc.dg/debug/btf/btf-function-2.c scan-assembler-times [\t ]0[\t ]+[^\n]*farg_type 1
# gcc:gcc.dg/debug/btf/btf-function-2.c scan-assembler-times [\t ]0xd000002[\t ]+[^\n]*btt_info 1
# gcc:gcc.dg/debug/btf/btf-function-2.c scan-assembler-times farg_name 2
# gcc:gcc.dg/debug/btf/btf-function-2.c scan-assembler-times farg_type 2
# gcc:gcc.dg/debug/btf/btf-function-3.c (test for excess errors)
# gcc:gcc.dg/debug/btf/btf-function-3.c scan-assembler-times [\t ]0[\t ]+[^\n]*farg_type 1
# gcc:gcc.dg/debug/btf/btf-function-3.c scan-assembler-times [\t ]0xd000003[\t ]+[^\n]*btt_info 1
# gcc:gcc.dg/debug/btf/btf-function-3.c scan-assembler-times farg_name 3
# gcc:gcc.dg/debug/btf/btf-function-3.c scan-assembler-times farg_type 3
# gcc:gcc.dg/debug/btf/btf-int-1.c (test for excess errors)
# gcc:gcc.dg/debug/btf/btf-int-1.c scan-assembler-times [\t ]0x10000..[\t ]+[^\n]*bti_encoding 3
# gcc:gcc.dg/debug/btf/btf-int-1.c scan-assembler-times [\t ]0x1000000[\t ]+[^\n]*btt_info 8
# gcc:gcc.dg/debug/btf/btf-int-1.c scan-assembler-times [\t ]0x20000..[\t ]+[^\n]*bti_encoding 1
# gcc:gcc.dg/debug/btf/btf-int-1.c scan-assembler-times [\t ]0x30000..[\t ]+[^\n]*bti_encoding 1
# gcc:gcc.dg/debug/btf/btf-int-1.c scan-assembler-times ascii "int.0"[\t ]+[^\n]*btf_string 1
# gcc:gcc.dg/debug/btf/btf-int-1.c scan-assembler-times ascii "long int.0"[\t ]+[^\n]*btf_string 1
# gcc:gcc.dg/debug/btf/btf-int-1.c scan-assembler-times ascii "long unsigned int.0"[\t ]+[^\n]*btf_string 1
# gcc:gcc.dg/debug/btf/btf-int-1.c scan-assembler-times ascii "short int.0"[\t ]+[^\n]*btf_string 1
# gcc:gcc.dg/debug/btf/btf-int-1.c scan-assembler-times ascii "short unsigned int.0"[\t ]+[^\n]*btf_string 1
# gcc:gcc.dg/debug/btf/btf-int-1.c scan-assembler-times ascii "signed char.0"[\t ]+[^\n]*btf_string 1
# gcc:gcc.dg/debug/btf/btf-int-1.c scan-assembler-times ascii "unsigned char.0"[\t ]+[^\n]*btf_string 1
# gcc:gcc.dg/debug/btf/btf-int-1.c scan-assembler-times ascii "unsigned int.0"[\t ]+[^\n]*btf_string 1
# gcc:gcc.dg/debug/btf/btf-pointers-1.c (test for excess errors)
# gcc:gcc.dg/debug/btf/btf-pointers-1.c scan-assembler-times [\t ]0x2000000[\t ]+[^\n]*btt_info 2
# gcc:gcc.dg/debug/btf/btf-pointers-1.c scan-assembler-times ascii "int.0"[\t ]+[^\n]*btf_string 1
# gcc:gcc.dg/debug/btf/btf-pointers-1.c scan-assembler-times ascii "st.0"[\t ]+[^\n]*btf_string 1
# gcc:gcc.dg/debug/btf/btf-pointers-2.c (test for excess errors)
# gcc:gcc.dg/debug/btf/btf-pointers-2.c scan-assembler-times [\t ]0x1000000[\t ]+[^\n]*btt_info 0
# gcc:gcc.dg/debug/btf/btf-pointers-2.c scan-assembler-times [\t ]0x2000000[\t ]+[^\n]*btt_info 1
# gcc:gcc.dg/debug/btf/btf-struct-1.c (test for excess errors)
# gcc:gcc.dg/debug/btf/btf-struct-1.c scan-assembler-times [\t ]0x4000002[\t ]+[^\n]*btt_info 1
# gcc:gcc.dg/debug/btf/btf-struct-1.c scan-assembler-times [\t ]0x4000003[\t ]+[^\n]*btt_info 1
# gcc:gcc.dg/debug/btf/btf-struct-1.c scan-assembler-times btm_name 5
# gcc:gcc.dg/debug/btf/btf-struct-2.c (test for excess errors)
# gcc:gcc.dg/debug/btf/btf-struct-2.c scan-assembler-times [\t ]0x4000002[\t ]+[^\n]*btt_info 1
# gcc:gcc.dg/debug/btf/btf-typedef-1.c (test for excess errors)
# gcc:gcc.dg/debug/btf/btf-typedef-1.c scan-assembler-times [\t ]0x2[\t ]+[^\n]*btv_type 1
# gcc:gcc.dg/debug/btf/btf-typedef-1.c scan-assembler-times [\t ]0x3[\t ]+[^\n]*btv_type 1
# gcc:gcc.dg/debug/btf/btf-typedef-1.c scan-assembler-times [\t ]0x4[\t ]+[^\n]*btv_type 1
# gcc:gcc.dg/debug/btf/btf-typedef-1.c scan-assembler-times [\t ]0x6[\t ]+[^\n]*btv_type 1
# gcc:gcc.dg/debug/btf/btf-typedef-1.c scan-assembler-times [\t ]0x8000000[\t ]+[^\n]*btt_info 7
# gcc:gcc.dg/debug/btf/btf-typedef-1.c scan-assembler-times [\t ]0x8[\t ]+[^\n]*btv_type 1
# gcc:gcc.dg/debug/btf/btf-typedef-1.c scan-assembler-times [\t ]0xb[\t ]+[^\n]*btv_type 1
# gcc:gcc.dg/debug/btf/btf-typedef-1.c scan-assembler-times [\t ]0xf[\t ]+[^\n]*btv_type 1
# gcc:gcc.dg/debug/btf/btf-typedef-1.c scan-assembler-times ascii "CBAR.0"[\t ]+[^\n]*btf_string 1
# gcc:gcc.dg/debug/btf/btf-typedef-1.c scan-assembler-times ascii "CBARP.0"[\t ]+[^\n]*btf_string 1
# gcc:gcc.dg/debug/btf/btf-typedef-1.c scan-assembler-times ascii "arena_t.0"[\t ]+[^\n]*btf_string 1
# gcc:gcc.dg/debug/btf/btf-typedef-1.c scan-assembler-times ascii "bar_int.0"[\t ]+[^\n]*btf_string 1
# gcc:gcc.dg/debug/btf/btf-typedef-1.c scan-assembler-times ascii "foo_int.0"[\t ]+[^\n]*btf_string 1
# gcc:gcc.dg/debug/btf/btf-typedef-1.c scan-assembler-times ascii "my_int.0"[\t ]+[^\n]*btf_string 1
# gcc:gcc.dg/debug/btf/btf-typedef-1.c scan-assembler-times ascii "node_t.0"[\t ]+[^\n]*btf_string 1
# gcc:gcc.dg/debug/btf/btf-union-1.c (test for excess errors)
# gcc:gcc.dg/debug/btf/btf-union-1.c scan-assembler-times [\t ]0x5000004[\t ]+[^\n]*btt_info 1
# gcc:gcc.dg/debug/btf/btf-union-1.c scan-assembler-times btm_name 4
# gcc:gcc.dg/debug/btf/btf-variables-1.c (test for excess errors)
# gcc:gcc.dg/debug/btf/btf-variables-1.c scan-assembler-times [\t ]0xe000000[\t ]+[^\n]*btv_info 6
# gcc:gcc.dg/debug/btf/btf-variables-2.c (test for excess errors)
# gcc:gcc.dg/debug/btf/btf-variables-2.c scan-assembler-times [\t ]0xe000000[\t ]+[^\n]*btv_info 3
# gcc:gcc.dg/debug/btf/btf-variables-2.c scan-assembler-times ascii "baz.0"[\t ]+[^\n]*btf_string 1
# gcc:gcc.dg/debug/btf/btf-variables-2.c scan-assembler-times ascii "foo.0"[\t ]+[^\n]*btf_string 1
# gcc:gcc.dg/debug/btf/btf-variables-2.c scan-assembler-times ascii "myst.0"[\t ]+[^\n]*btf_string 1
# gcc:gcc.dg/debug/btf/btf-variables-3.c (test for excess errors)
# gcc:gcc.dg/debug/btf/btf-variables-3.c scan-assembler-times [\t ]0[\t ]+[^\n]*btv_linkage 3
# gcc:gcc.dg/debug/btf/btf-variables-3.c scan-assembler-times [\t ]0x1[\t ]+[^\n]*btv_linkage 3
# gcc:gcc.dg/debug/btf/btf-variables-3.c scan-assembler-times [\t ]0xe000000[\t ]+[^\n]*btv_info 6
# Executed from: gcc.dg/debug/debug.exp
# gcc:gcc.dg/debug/const-1.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/const-2.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/const-3.c -gctf scan-assembler-not dontgenerate
# gcc:gcc.dg/debug/const-3.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/crash1.c -gctf (test for excess errors)
# Executed from: gcc.dg/debug/ctf/ctf.exp
# gcc:gcc.dg/debug/ctf/ctf-1.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-2.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-2.c scan-assembler-times 0.*CTF preamble flags 0
# gcc:gcc.dg/debug/ctf/ctf-2.c scan-assembler-times 0x4.*CTF preamble version 0
# gcc:gcc.dg/debug/ctf/ctf-2.c scan-assembler-times 0xdff2.*CTF preamble magic number 0
# gcc:gcc.dg/debug/ctf/ctf-anonymous-struct-1.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-anonymous-struct-1.c scan-assembler-times 0x1a000001[\t ]+[^\n]*ctt_info 1
# gcc:gcc.dg/debug/ctf/ctf-anonymous-struct-1.c scan-assembler-times 0x1a000002[\t ]+[^\n]*ctt_info 1
# gcc:gcc.dg/debug/ctf/ctf-anonymous-struct-1.c scan-assembler-times [\t ]0[\t ]+[^\n]*ctt_name 1
# gcc:gcc.dg/debug/ctf/ctf-anonymous-union-1.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-anonymous-union-1.c scan-assembler-times 0x1a000001[\t ]+[^\n]*ctt_info 1
# gcc:gcc.dg/debug/ctf/ctf-anonymous-union-1.c scan-assembler-times 0x1e000002[\t ]+[^\n]*ctt_info 1
# gcc:gcc.dg/debug/ctf/ctf-anonymous-union-1.c scan-assembler-times [\t ]0[\t ]+[^\n]*ctt_name 1
# gcc:gcc.dg/debug/ctf/ctf-array-1.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-array-1.c scan-assembler-times 0x12000000[\t ]+[^\n]*ctt_info 5
# gcc:gcc.dg/debug/ctf/ctf-array-1.c scan-assembler-times [\t ]0[\t ]+[^\n]*cta_nelems 1
# gcc:gcc.dg/debug/ctf/ctf-array-1.c scan-assembler-times [\t ]0x2[\t ]+[^\n]*cta_nelems 2
# gcc:gcc.dg/debug/ctf/ctf-array-1.c scan-assembler-times [\t ]0x3[\t ]+[^\n]*cta_nelems 1
# gcc:gcc.dg/debug/ctf/ctf-array-1.c scan-assembler-times [\t ]0x5[\t ]+[^\n]*cta_nelems 1
# gcc:gcc.dg/debug/ctf/ctf-array-2.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-array-2.c scan-assembler-times 0x12000000[\t ]+[^\n]*ctt_info 5
# gcc:gcc.dg/debug/ctf/ctf-array-2.c scan-assembler-times [\t ]0[\t ]+[^\n]*cta_nelems 3
# gcc:gcc.dg/debug/ctf/ctf-array-2.c scan-assembler-times [\t ]0x5[\t ]+[^\n]*cta_nelems 1
# gcc:gcc.dg/debug/ctf/ctf-array-3.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-array-4.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-array-4.c scan-assembler-times 0x12000000[\t ]+[^\n]*ctt_info 1
# gcc:gcc.dg/debug/ctf/ctf-array-4.c scan-assembler-times [\t ]0x1[\t ]+[^\n]*cta_nelems 1
# gcc:gcc.dg/debug/ctf/ctf-attr-mode-1.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-attr-mode-1.c scan-assembler-times [\t ]0x22000003[\t ]+[^\n]*ctt_info 1
# gcc:gcc.dg/debug/ctf/ctf-attr-mode-1.c scan-assembler-times [\t ]0x2a000000[\t ]+[^\n]*ctt_info 1
# gcc:gcc.dg/debug/ctf/ctf-attr-mode-1.c scan-assembler-times [\t ]0x3[\t ]+[^\n]*ctv_typeidx 1
# gcc:gcc.dg/debug/ctf/ctf-attr-mode-1.c scan-assembler-times ascii "B1.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-attr-mode-1.c scan-assembler-times ascii "B2.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-attr-mode-1.c scan-assembler-times ascii "B3.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-attr-mode-1.c scan-assembler-times cte_value 3
# gcc:gcc.dg/debug/ctf/ctf-attr-used-1.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-attr-used-1.c scan-assembler-times ascii "keep_this.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-attr-used-1.c scan-assembler-times ascii "lose_this.0"[\t ]+[^\n]*ctf_string 0
# gcc:gcc.dg/debug/ctf/ctf-bitfields-1.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-bitfields-1.c scan-assembler-times [\t ]0[\t ]+[^\n]*ctt_name 2
# gcc:gcc.dg/debug/ctf/ctf-bitfields-1.c scan-assembler-times [\t ]0x2[\t ]+[^\n]*cts_bits 1
# gcc:gcc.dg/debug/ctf/ctf-bitfields-1.c scan-assembler-times [\t ]0x3[\t ]+[^\n]*cts_bits 1
# gcc:gcc.dg/debug/ctf/ctf-bitfields-2.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-bitfields-2.c scan-assembler-times [\t ]0x10[\t ]+[^\n]*cts_bits 2
# gcc:gcc.dg/debug/ctf/ctf-bitfields-2.c scan-assembler-times [\t ]0x21[\t ]+[^\n]*cts_bits 2
# gcc:gcc.dg/debug/ctf/ctf-bitfields-2.c scan-assembler-times [\t ]0x2[\t ]+[^\n]*cts_type 3
# gcc:gcc.dg/debug/ctf/ctf-bitfields-2.c scan-assembler-times [\t ]0x6[\t ]+[^\n]*cts_type 3
# gcc:gcc.dg/debug/ctf/ctf-bitfields-2.c scan-assembler-times [\t ]0xf[\t ]+[^\n]*cts_bits 2
# gcc:gcc.dg/debug/ctf/ctf-bitfields-2.c scan-assembler-times ascii "long long int.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-bitfields-2.c scan-assembler-times ascii "long long unsigned int.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-bitfields-3.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-bitfields-3.c scan-assembler-times [\t ]0x1[\t ]+[^\n]*cts_bits 2
# gcc:gcc.dg/debug/ctf/ctf-bitfields-3.c scan-assembler-times [\t ]0x2[\t ]+[^\n]*cts_type 2
# gcc:gcc.dg/debug/ctf/ctf-bitfields-3.c scan-assembler-times ascii "_Bool.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-bitfields-4.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-bitfields-4.c scan-assembler-times [\t ]0x2[\t ]+[^\n]*cts_type 2
# gcc:gcc.dg/debug/ctf/ctf-bitfields-4.c scan-assembler-times [\t ]0x5[\t ]+[^\n]*cts_bits 1
# gcc:gcc.dg/debug/ctf/ctf-bitfields-4.c scan-assembler-times [\t ]0xa[\t ]+[^\n]*cts_bits 1
# gcc:gcc.dg/debug/ctf/ctf-bitfields-4.c scan-assembler-times ctm_name 2
# gcc:gcc.dg/debug/ctf/ctf-complex-1.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-complex-1.c scan-assembler-times ascii "complex double.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-complex-1.c scan-assembler-times ascii "complex float.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-complex-1.c scan-assembler-times ascii "complex long double.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-cvr-quals-1.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-cvr-quals-1.c scan-assembler-times [\t ]0[\t ]+[^\n]*ctt_name 7
# gcc:gcc.dg/debug/ctf/ctf-cvr-quals-1.c scan-assembler-times [\t ]0x2e000000[\t ]+[^\n]*ctt_info 1
# gcc:gcc.dg/debug/ctf/ctf-cvr-quals-1.c scan-assembler-times [\t ]0x32000000[\t ]+[^\n]*ctt_info 2
# gcc:gcc.dg/debug/ctf/ctf-cvr-quals-1.c scan-assembler-times [\t ]0x36000000[\t ]+[^\n]*ctt_info 2
# gcc:gcc.dg/debug/ctf/ctf-cvr-quals-1.c scan-assembler-times [\t ]0xe000000[\t ]+[^\n]*ctt_info 2
# gcc:gcc.dg/debug/ctf/ctf-cvr-quals-1.c scan-assembler-times ascii "int.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-cvr-quals-2.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-cvr-quals-2.c scan-assembler-times [\t ]0x32000000[\t ]+[^\n]*ctt_info 2
# gcc:gcc.dg/debug/ctf/ctf-cvr-quals-2.c scan-assembler-times ascii "int.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-cvr-quals-3.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-cvr-quals-3.c scan-assembler-times [\t ]0x12000000[\t ]+[^\n]*ctt_info 2
# gcc:gcc.dg/debug/ctf/ctf-cvr-quals-3.c scan-assembler-times [\t ]0x2e000000[\t ]+[^\n]*ctt_info 5
# gcc:gcc.dg/debug/ctf/ctf-cvr-quals-3.c scan-assembler-times [\t ]0x32000000[\t ]+[^\n]*ctt_info 3
# gcc:gcc.dg/debug/ctf/ctf-cvr-quals-3.c scan-assembler-times ascii "unsigned char.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-cvr-quals-4.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-cvr-quals-4.c scan-assembler-times [\t ]0[\t ]+[^\n]*ctt_name 2
# gcc:gcc.dg/debug/ctf/ctf-cvr-quals-4.c scan-assembler-times [\t ]0x32000000[\t ]+[^\n]*ctt_info 1
# gcc:gcc.dg/debug/ctf/ctf-cvr-quals-4.c scan-assembler-times [\t ]0xe000000[\t ]+[^\n]*ctt_info 1
# gcc:gcc.dg/debug/ctf/ctf-debug-1.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-debug-1.c scan-assembler 0xdff2.*CTF preamble magic number
# gcc:gcc.dg/debug/ctf/ctf-debug-2.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-debug-2.c scan-assembler 0xdff2.*CTF preamble magic number
# gcc:gcc.dg/debug/ctf/ctf-enum-1.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-enum-1.c scan-assembler-times ascii "BLUE.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-enum-1.c scan-assembler-times ascii "GREEN.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-enum-1.c scan-assembler-times ascii "RED.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-enum-1.c scan-assembler-times ascii "YELLOW.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-enum-1.c scan-assembler-times cte_value 4
# gcc:gcc.dg/debug/ctf/ctf-enum-2.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-enum-2.c scan-assembler-times ascii "GFS_MONOTONIC.0"[\t ]+[^\n]*ctf_string 0
# gcc:gcc.dg/debug/ctf/ctf-enum-2.c scan-assembler-times ascii "GFS_RUNTIME.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-enum-2.c scan-assembler-times ascii "GFS_STATIC.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-enum-2.c scan-assembler-times cte_value 2
# gcc:gcc.dg/debug/ctf/ctf-file-scope-1.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-file-scope-1.c scan-assembler-times ascii "SFOO.0"[\t ]+[^\n]*ctf_string 0
# gcc:gcc.dg/debug/ctf/ctf-file-scope-1.c scan-assembler-times ascii "foo.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-file-scope-1.c scan-assembler-times ascii "gfoo.0"[\t ]+[^\n]*ctf_string 0
# gcc:gcc.dg/debug/ctf/ctf-float-1.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-float-1.c scan-assembler-times ascii "double.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-float-1.c scan-assembler-times ascii "float.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-float-1.c scan-assembler-times ascii "long double.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-forward-1.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-forward-1.c scan-assembler-times [\t ]0x26000000[\t ]+[^\n]*ctt_info 2
# gcc:gcc.dg/debug/ctf/ctf-forward-1.c scan-assembler-times [\t ]0x6[\t ]+[^\n]*ctt_size or ctt_type 2
# gcc:gcc.dg/debug/ctf/ctf-forward-1.c scan-assembler-times [\t ]0x7[\t ]+[^\n]*ctt_size or ctt_type 2
# gcc:gcc.dg/debug/ctf/ctf-forward-2.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-forward-2.c scan-assembler-times [\t ]0x26000000[\t ]+[^\n]*ctt_info 1
# gcc:gcc.dg/debug/ctf/ctf-forward-2.c scan-assembler-times [\t ]0x8[\t ]+[^\n]*ctt_size or ctt_type 1
# gcc:gcc.dg/debug/ctf/ctf-forward-2.c scan-assembler-times ascii "vibgyor.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-func-index-1.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-func-index-1.c scan-assembler-times ascii "bar.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-func-index-1.c scan-assembler-times ascii "foo.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-func-index-1.c scan-assembler-times funcinfo_func_type 2
# gcc:gcc.dg/debug/ctf/ctf-func-index-1.c scan-assembler-times funcinfo_name 2
# gcc:gcc.dg/debug/ctf/ctf-function-pointers-1.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-function-pointers-1.c scan-assembler-times [\t ]0x16000001[\t ]+[^\n]*ctt_info 1
# gcc:gcc.dg/debug/ctf/ctf-function-pointers-1.c scan-assembler-times [\t ]0x16000002[\t ]+[^\n]*ctt_info 1
# gcc:gcc.dg/debug/ctf/ctf-function-pointers-1.c scan-assembler-times [\t ]0x16000003[\t ]+[^\n]*ctt_info 1
# gcc:gcc.dg/debug/ctf/ctf-function-pointers-1.c scan-assembler-times ascii "__foo_fn.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-function-pointers-1.c scan-assembler-times ascii "destroy.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-function-pointers-1.c scan-assembler-times ascii "func.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-function-pointers-2.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-function-pointers-2.c scan-assembler-times [\t ]0x16000001[\t ]+[^\n]*ctt_info 1
# gcc:gcc.dg/debug/ctf/ctf-function-pointers-2.c scan-assembler-times ascii "func.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-function-pointers-2.c scan-assembler-times ascii "rcu_callback_t.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-function-pointers-3.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-function-pointers-3.c scan-assembler-times [\t ]0x16000001[\t ]+[^\n]*ctt_info 1
# gcc:gcc.dg/debug/ctf/ctf-function-pointers-3.c scan-assembler-times ascii "fn.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-function-pointers-3.c scan-assembler-times ascii "foo_init_callback.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-function-pointers-4.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-function-pointers-4.c scan-assembler-times [\t ]0x16000001[\t ]+[^\n]*ctt_info 1
# gcc:gcc.dg/debug/ctf/ctf-function-pointers-4.c scan-assembler-times ascii "var_assign_func_t.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-functions-1.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-functions-1.c scan-assembler-times [\t ]0[\t ]+[^\n]*dtu_argv 1
# gcc:gcc.dg/debug/ctf/ctf-functions-1.c scan-assembler-times [\t ]0x16000002[\t ]+[^\n]*ctt_info 1
# gcc:gcc.dg/debug/ctf/ctf-functions-1.c scan-assembler-times dtu_argv 2
# gcc:gcc.dg/debug/ctf/ctf-int-1.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-int-1.c scan-assembler-times ascii "int.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-int-1.c scan-assembler-times ascii "long int.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-int-1.c scan-assembler-times ascii "short int.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-objt-index-1.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-objt-index-1.c scan-assembler-times ascii "a.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-objt-index-1.c scan-assembler-times ascii "a1.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-objt-index-1.c scan-assembler-times ascii "b.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-objt-index-1.c scan-assembler-times ascii "d_instance.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-objt-index-1.c scan-assembler-times objtinfo_name 4
# gcc:gcc.dg/debug/ctf/ctf-objt-index-1.c scan-assembler-times objtinfo_var_type 4
# gcc:gcc.dg/debug/ctf/ctf-pointers-1.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-pointers-1.c scan-assembler-times [\t ]0xe000000[\t ]+[^\n]*ctt_info 2
# gcc:gcc.dg/debug/ctf/ctf-pointers-1.c scan-assembler-times ascii "foo_struct.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-pointers-1.c scan-assembler-times ascii "int.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-pointers-2.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-pointers-2.c scan-assembler-times [\t ]0xe000000[\t ]+[^\n]*ctt_info 1
# gcc:gcc.dg/debug/ctf/ctf-preamble-1.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-preamble-1.c scan-assembler 0.*CTF preamble flags
# gcc:gcc.dg/debug/ctf/ctf-preamble-1.c scan-assembler 0x4.*CTF preamble version
# gcc:gcc.dg/debug/ctf/ctf-preamble-1.c scan-assembler 0xdff2.*CTF preamble magic number
# gcc:gcc.dg/debug/ctf/ctf-skip-types-1.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-skip-types-1.c scan-assembler-times [\t ]0x2000000[\t ]+[^\n]*ctt_info 1
# gcc:gcc.dg/debug/ctf/ctf-skip-types-1.c scan-assembler-times ascii "unknown.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-skip-types-3.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-skip-types-8.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-skip-types-8.c scan-assembler-times [\t ]0x1a000003[\t ]+[^\n]*ctt_info 1
# gcc:gcc.dg/debug/ctf/ctf-skip-types-8.c scan-assembler-times [\t ]0x2a000000[\t ]+[^\n]*ctt_info 1
# gcc:gcc.dg/debug/ctf/ctf-skip-types-8.c scan-assembler-times [\t ]0x32000000[\t ]+[^\n]*ctt_info 1
# gcc:gcc.dg/debug/ctf/ctf-skip-types-8.c scan-assembler-times ascii "c1.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-skip-types-8.c scan-assembler-times ascii "comp_type.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-skip-types-8.c scan-assembler-times ascii "comp_type_t.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-skip-types-8.c scan-assembler-times ctm_name 3
# gcc:gcc.dg/debug/ctf/ctf-str-table-1.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-str-table-1.c scan-assembler-times ascii ".0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-struct-1.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-struct-1.c scan-assembler-times [\t ]0x1a000002[\t ]+[^\n]*ctt_info 1
# gcc:gcc.dg/debug/ctf/ctf-struct-1.c scan-assembler-times [\t ]0x1a000004[\t ]+[^\n]*ctt_info 1
# gcc:gcc.dg/debug/ctf/ctf-struct-1.c scan-assembler-times ctm_name 6
# gcc:gcc.dg/debug/ctf/ctf-struct-2.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-struct-2.c scan-assembler-times ascii "dmx_dtdef.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-struct-2.c scan-assembler-times ascii "dmx_dtdef_t.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-struct-2.c scan-assembler-times ascii "dtd_name.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-struct-2.c scan-assembler-times ascii "dtd_type.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-struct-array-1.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-struct-array-1.c scan-assembler-times [\t ]0x32000000[\t ]+[^\n]*ctt_info 3
# gcc:gcc.dg/debug/ctf/ctf-struct-array-1.c scan-assembler-times ascii "cmodel.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-struct-array-1.c scan-assembler-times ascii "cmodel_t.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-struct-array-1.c scan-assembler-times ascii "cname.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-struct-array-1.c scan-assembler-times ascii "cpointer.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-struct-array-2.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-struct-array-2.c scan-assembler-times 0x12000000[\t ]+[^\n]*ctt_info 1
# gcc:gcc.dg/debug/ctf/ctf-struct-array-2.c scan-assembler-times [\t ]0[\t ]+[^\n]*ctm_offset 1
# gcc:gcc.dg/debug/ctf/ctf-struct-array-2.c scan-assembler-times [\t ]0x4[\t ]+[^\n]*cta_nelems 1
# gcc:gcc.dg/debug/ctf/ctf-struct-array-2.c scan-assembler-times [\t ]0x4[\t ]+[^\n]*ctm_offset 1
# gcc:gcc.dg/debug/ctf/ctf-struct-pointer-1.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-struct-pointer-1.c scan-assembler-times [\t ]"bar.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-struct-pointer-2.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-struct-pointer-2.c scan-assembler-times [\t ]"bar.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-typedef-1.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-typedef-1.c scan-assembler-times 0x2a000000[\t ]+[^\n]*ctt_info 7
# gcc:gcc.dg/debug/ctf/ctf-typedef-1.c scan-assembler-times [\t ]0x2[\t ]+[^\n]*ctv_typeidx 1
# gcc:gcc.dg/debug/ctf/ctf-typedef-1.c scan-assembler-times [\t ]0x4[\t ]+[^\n]*ctv_typeidx 1
# gcc:gcc.dg/debug/ctf/ctf-typedef-1.c scan-assembler-times [\t ]0x5[\t ]+[^\n]*ctv_typeidx 1
# gcc:gcc.dg/debug/ctf/ctf-typedef-1.c scan-assembler-times [\t ]0x9[\t ]+[^\n]*ctv_typeidx 1
# gcc:gcc.dg/debug/ctf/ctf-typedef-1.c scan-assembler-times [\t ]0xa[\t ]+[^\n]*ctv_typeidx 1
# gcc:gcc.dg/debug/ctf/ctf-typedef-1.c scan-assembler-times [\t ]0xc[\t ]+[^\n]*ctv_typeidx 1
# gcc:gcc.dg/debug/ctf/ctf-typedef-1.c scan-assembler-times [\t ]0xf[\t ]+[^\n]*ctv_typeidx 1
# gcc:gcc.dg/debug/ctf/ctf-typedef-1.c scan-assembler-times ascii "CINT.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-typedef-1.c scan-assembler-times ascii "CINTP.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-typedef-1.c scan-assembler-times ascii "bar_int.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-typedef-1.c scan-assembler-times ascii "foo_int.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-typedef-1.c scan-assembler-times ascii "my_array.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-typedef-1.c scan-assembler-times ascii "my_int.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-typedef-1.c scan-assembler-times ascii "my_node_t.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-typedef-2.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-typedef-2.c scan-assembler-times 0x2a000000[\t ]+[^\n]*ctt_info 1
# gcc:gcc.dg/debug/ctf/ctf-typedef-2.c scan-assembler-times ascii "foo_void_type.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-typedef-2.c scan-assembler-times ascii "void.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-typedef-3.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-typedef-3.c scan-assembler-times 0x2a000000[\t ]+[^\n]*ctt_info 1
# gcc:gcc.dg/debug/ctf/ctf-typedef-3.c scan-assembler-times ascii "foo.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-typedef-3.c scan-assembler-times ascii "foo_type.0"[\t ]+[^\n]*ctf_string 1
# gcc:gcc.dg/debug/ctf/ctf-typedef-struct-1.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-typedef-struct-2.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-typedef-struct-3.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-typedef-struct-3.c scan-assembler-times [\t ]0x2a000000[\t ]+[^\n]*ctt_info 1
# gcc:gcc.dg/debug/ctf/ctf-typedef-struct-3.c scan-assembler-times [\t ]0x32000000[\t ]+[^\n]*ctt_info 1
# gcc:gcc.dg/debug/ctf/ctf-typedef-struct-3.c scan-assembler-times [\t ]0x4[\t ]+[^\n]*ctv_typeidx 1
# gcc:gcc.dg/debug/ctf/ctf-union-1.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-union-1.c scan-assembler-times [\t ]0x1e000004[\t ]+[^\n]*ctt_info 1
# gcc:gcc.dg/debug/ctf/ctf-union-1.c scan-assembler-times ctm_name 4
# gcc:gcc.dg/debug/ctf/ctf-variables-1.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-variables-1.c scan-assembler-times ctv_name 7
# gcc:gcc.dg/debug/ctf/ctf-variables-2.c (test for excess errors)
# gcc:gcc.dg/debug/ctf/ctf-variables-2.c scan-assembler-times ascii "bstatic.0"[\t ]+[^\n]*ctf_string 0
# gcc:gcc.dg/debug/ctf/ctf-variables-2.c scan-assembler-times ctv_name 0
# Executed from: gcc.dg/debug/debug.exp
# gcc:gcc.dg/debug/debug-3.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/debug-4.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/debug-5.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/debug-7.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/dwarf2-1.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/dwarf2-2.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/enum-1.c -gctf scan-assembler JTI_MAX
# gcc:gcc.dg/debug/enum-1.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/pr16676.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/pr26881.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/pr29558.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/pr29609-1.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/pr29609-1.c -gctf execution test
# gcc:gcc.dg/debug/pr29609-2.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/pr29609-2.c -gctf execution test
# gcc:gcc.dg/debug/pr32610.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/pr33316.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/pr36690-1.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/pr36690-1.c -gctf execution test
# gcc:gcc.dg/debug/pr36690-2.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/pr36690-2.c -gctf execution test
# gcc:gcc.dg/debug/pr36690-3.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/pr36690-3.c -gctf execution test
# gcc:gcc.dg/debug/pr37616.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/pr37616.c -gctf execution test
# gcc:gcc.dg/debug/pr39412.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/pr41264-1.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/pr41343-1.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/pr41717.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/pr41893-1.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/pr41893-2.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/pr42244.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/pr42767.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/pr43972.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/pr45849.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/pr46409.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/pr46782.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/pr47498.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/pr47501.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/pr49032.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/pr49294.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/pr49522.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/pr55730.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/pr57351.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/pr65771.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/pr66068.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/pr66432.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/pr78587.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/pr80321.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/pr85252.c -gctf (test for warnings, line 10)
# gcc:gcc.dg/debug/pr85252.c -gctf (test for warnings, line 8)
# gcc:gcc.dg/debug/pr85252.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/pr89704.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/pr97714.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/redecl-1.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/redecl-2.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/redecl-3.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/redecl-4.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/redecl-5.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/tls-1.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/trivial.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/trivial.c -gctf execution test
# gcc:gcc.dg/debug/vta-1.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/vta-2.c -gctf (test for excess errors)
# gcc:gcc.dg/debug/vta-3.c -gctf (test for excess errors)
# Executed from: gcc.dg/ipa/ipa.exp
# gcc:gcc.dg/ipa/ipa-sra-23.c (test for excess errors)
# gcc:gcc.dg/ipa/ipa-sra-24.c (test for excess errors)
# gcc:gcc.dg/ipa/pr93385.c (test for excess errors)
# gcc:gcc.dg/ipa/pr93385.c execution test
#
#
# - UNSUPPORTED appears [ =>UNSUP]:
#
# Executed from: g++.dg/dg.exp
# g++:g++.dg/ipa/ipa-sra-4.C -std=gnu++98
# Executed from: gcc.dg/debug/ctf/ctf.exp
# gcc:gcc.dg/debug/ctf/ctf-skip-types-4.c
# gcc:gcc.dg/debug/ctf/ctf-skip-types-5.c
# gcc:gcc.dg/debug/ctf/ctf-skip-types-6.c
# gcc:gcc.dg/debug/ctf/ctf-skip-types-7.c
# Executed from: gcc.dg/debug/debug.exp
# gcc:gcc.dg/debug/pr35154.c -gctf
#
#
#
# # Regressions found
# # Regressions in 12 common sum files found
from (for last_good == b7e215a8ee81d44281d9e0a2a25eceb47b6911dd)
# reset_artifacts:
-10
# build_abe bootstrap:
0
# build_abe check_bootstrap:
1
Artifacts of last_good build: https://ci.linaro.org/job/tcwg_gcc-bisect-gnu-master-arm-check_bootstrap/67…
Artifacts of first_bad build: https://ci.linaro.org/job/tcwg_gcc-bisect-gnu-master-arm-check_bootstrap/67…
Build top page/logs: https://ci.linaro.org/job/tcwg_gcc-bisect-gnu-master-arm-check_bootstrap/67/
Configuration details:
Reproduce builds:
<cut>
mkdir investigate-gcc-c1f76af469388d3df815c82de566387da5ae000f
cd investigate-gcc-c1f76af469388d3df815c82de566387da5ae000f
git clone https://git.linaro.org/toolchain/jenkins-scripts
mkdir -p artifacts/manifests
curl -o artifacts/manifests/build-baseline.sh https://ci.linaro.org/job/tcwg_gcc-bisect-gnu-master-arm-check_bootstrap/67… --fail
curl -o artifacts/manifests/build-parameters.sh https://ci.linaro.org/job/tcwg_gcc-bisect-gnu-master-arm-check_bootstrap/67… --fail
curl -o artifacts/test.sh https://ci.linaro.org/job/tcwg_gcc-bisect-gnu-master-arm-check_bootstrap/67… --fail
chmod +x artifacts/test.sh
# Reproduce the baseline build (build all pre-requisites)
./jenkins-scripts/tcwg_gnu-build.sh @@ artifacts/manifests/build-baseline.sh
cd gcc
# Reproduce first_bad build
git checkout --detach c1f76af469388d3df815c82de566387da5ae000f
../artifacts/test.sh
# Reproduce last_good build
git checkout --detach b7e215a8ee81d44281d9e0a2a25eceb47b6911dd
../artifacts/test.sh
cd ..
</cut>
History of pending regressions and results: https://git.linaro.org/toolchain/ci/base-artifacts.git/log/?h=linaro-local/…
Artifacts: https://ci.linaro.org/job/tcwg_gcc-bisect-gnu-master-arm-check_bootstrap/67…
Build log: https://ci.linaro.org/job/tcwg_gcc-bisect-gnu-master-arm-check_bootstrap/67…
Full commit (up to 1000 lines):
<cut>
commit c1f76af469388d3df815c82de566387da5ae000f
Author: Indu Bhagat <indu.bhagat(a)oracle.com>
Date: Thu May 20 11:19:04 2021 -0700
CTF/BTF testsuites
This commit adds a new testsuite for the CTF debug format.
2021-06-28 Indu Bhagat <indu.bhagat(a)oracle.com>
David Faust <david.faust(a)oracle.com>
gcc/testsuite/
* lib/gcc-dg.exp (gcc-dg-frontend-supports-ctf): New procedure.
(gcc-dg-debug-runtest): Add -gctf support.
* gcc.dg/debug/btf/btf-1.c: New test.
* gcc.dg/debug/btf/btf-2.c: Likewise.
* gcc.dg/debug/btf/btf-anonymous-struct-1.c: Likewise.
* gcc.dg/debug/btf/btf-anonymous-union-1.c: Likewise.
* gcc.dg/debug/btf/btf-array-1.c: Likewise.
* gcc.dg/debug/btf/btf-bitfields-1.c: Likewise.
* gcc.dg/debug/btf/btf-bitfields-2.c: Likewise.
* gcc.dg/debug/btf/btf-bitfields-3.c: Likewise.
* gcc.dg/debug/btf/btf-cvr-quals-1.c: Likewise.
* gcc.dg/debug/btf/btf-enum-1.c: Likewise.
* gcc.dg/debug/btf/btf-forward-1.c: Likewise.
* gcc.dg/debug/btf/btf-function-1.c: Likewise.
* gcc.dg/debug/btf/btf-function-2.c: Likewise.
* gcc.dg/debug/btf/btf-int-1.c: Likewise.
* gcc.dg/debug/btf/btf-pointers-1.c: Likewise.
* gcc.dg/debug/btf/btf-struct-1.c: Likewise.
* gcc.dg/debug/btf/btf-typedef-1.c: Likewise.
* gcc.dg/debug/btf/btf-union-1.c: Likewise.
* gcc.dg/debug/btf/btf-variables-1.c: Likewise.
* gcc.dg/debug/btf/btf.exp: Likewise.
* gcc.dg/debug/ctf/ctf-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-2.c: Likewise.
* gcc.dg/debug/ctf/ctf-anonymous-struct-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-anonymous-union-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-array-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-array-2.c: Likewise.
* gcc.dg/debug/ctf/ctf-array-3.c: Likewise.
* gcc.dg/debug/ctf/ctf-array-4.c: Likewise.
* gcc.dg/debug/ctf/ctf-attr-mode-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-attr-used-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-bitfields-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-bitfields-2.c: Likewise.
* gcc.dg/debug/ctf/ctf-bitfields-3.c: Likewise.
* gcc.dg/debug/ctf/ctf-bitfields-4.c: Likewise.
* gcc.dg/debug/ctf/ctf-complex-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-cvr-quals-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-cvr-quals-2.c: Likewise.
* gcc.dg/debug/ctf/ctf-cvr-quals-3.c: Likewise.
* gcc.dg/debug/ctf/ctf-cvr-quals-4.c: Likewise.
* gcc.dg/debug/ctf/ctf-enum-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-enum-2.c: Likewise.
* gcc.dg/debug/ctf/ctf-file-scope-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-float-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-forward-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-forward-2.c: Likewise.
* gcc.dg/debug/ctf/ctf-func-index-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-function-pointers-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-function-pointers-2.c: Likewise.
* gcc.dg/debug/ctf/ctf-function-pointers-3.c: Likewise.
* gcc.dg/debug/ctf/ctf-functions-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-int-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-objt-index-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-pointers-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-pointers-2.c: Likewise.
* gcc.dg/debug/ctf/ctf-preamble-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-skip-types-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-skip-types-2.c: Likewise.
* gcc.dg/debug/ctf/ctf-skip-types-3.c: Likewise.
* gcc.dg/debug/ctf/ctf-skip-types-4.c: Likewise.
* gcc.dg/debug/ctf/ctf-skip-types-5.c: Likewise.
* gcc.dg/debug/ctf/ctf-skip-types-6.c: Likewise.
* gcc.dg/debug/ctf/ctf-str-table-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-struct-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-struct-2.c: Likewise.
* gcc.dg/debug/ctf/ctf-struct-array-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-struct-pointer-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-struct-pointer-2.c: Likewise.
* gcc.dg/debug/ctf/ctf-typedef-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-typedef-2.c: Likewise.
* gcc.dg/debug/ctf/ctf-typedef-3.c: Likewise.
* gcc.dg/debug/ctf/ctf-typedef-struct-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-typedef-struct-2.c: Likewise.
* gcc.dg/debug/ctf/ctf-typedef-struct-3.c: Likewise.
* gcc.dg/debug/ctf/ctf-union-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-variables-1.c: Likewise.
* gcc.dg/debug/ctf/ctf-variables-2.c: Likewise.
* gcc.dg/debug/ctf/ctf.exp: Likewise.
---
gcc/testsuite/gcc.dg/debug/btf/btf-1.c | 6 ++
gcc/testsuite/gcc.dg/debug/btf/btf-2.c | 10 +++
.../gcc.dg/debug/btf/btf-anonymous-struct-1.c | 23 ++++++
.../gcc.dg/debug/btf/btf-anonymous-union-1.c | 23 ++++++
gcc/testsuite/gcc.dg/debug/btf/btf-array-1.c | 31 ++++++++
gcc/testsuite/gcc.dg/debug/btf/btf-bitfields-1.c | 34 +++++++++
gcc/testsuite/gcc.dg/debug/btf/btf-bitfields-2.c | 26 +++++++
gcc/testsuite/gcc.dg/debug/btf/btf-bitfields-3.c | 43 ++++++++++++
gcc/testsuite/gcc.dg/debug/btf/btf-bitfields-4.c | 23 ++++++
gcc/testsuite/gcc.dg/debug/btf/btf-cvr-quals-1.c | 52 ++++++++++++++
gcc/testsuite/gcc.dg/debug/btf/btf-datasec-1.c | 45 ++++++++++++
gcc/testsuite/gcc.dg/debug/btf/btf-enum-1.c | 30 ++++++++
gcc/testsuite/gcc.dg/debug/btf/btf-forward-1.c | 24 +++++++
gcc/testsuite/gcc.dg/debug/btf/btf-function-1.c | 18 +++++
gcc/testsuite/gcc.dg/debug/btf/btf-function-2.c | 18 +++++
gcc/testsuite/gcc.dg/debug/btf/btf-function-3.c | 22 ++++++
gcc/testsuite/gcc.dg/debug/btf/btf-int-1.c | 44 ++++++++++++
gcc/testsuite/gcc.dg/debug/btf/btf-pointers-1.c | 25 +++++++
gcc/testsuite/gcc.dg/debug/btf/btf-pointers-2.c | 13 ++++
gcc/testsuite/gcc.dg/debug/btf/btf-struct-1.c | 22 ++++++
gcc/testsuite/gcc.dg/debug/btf/btf-struct-2.c | 19 +++++
gcc/testsuite/gcc.dg/debug/btf/btf-typedef-1.c | 82 ++++++++++++++++++++++
gcc/testsuite/gcc.dg/debug/btf/btf-union-1.c | 16 +++++
gcc/testsuite/gcc.dg/debug/btf/btf-variables-1.c | 33 +++++++++
gcc/testsuite/gcc.dg/debug/btf/btf-variables-2.c | 27 +++++++
gcc/testsuite/gcc.dg/debug/btf/btf-variables-3.c | 36 ++++++++++
gcc/testsuite/gcc.dg/debug/btf/btf.exp | 41 +++++++++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-1.c | 6 ++
gcc/testsuite/gcc.dg/debug/ctf/ctf-2.c | 10 +++
.../gcc.dg/debug/ctf/ctf-anonymous-struct-1.c | 23 ++++++
.../gcc.dg/debug/ctf/ctf-anonymous-union-1.c | 26 +++++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-array-1.c | 31 ++++++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-array-2.c | 38 ++++++++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-array-3.c | 17 +++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-array-4.c | 13 ++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-attr-mode-1.c | 22 ++++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-attr-used-1.c | 22 ++++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-bitfields-1.c | 30 ++++++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-bitfields-2.c | 39 ++++++++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-bitfields-3.c | 16 +++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-bitfields-4.c | 19 +++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-complex-1.c | 21 ++++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-cvr-quals-1.c | 65 +++++++++++++++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-cvr-quals-2.c | 30 ++++++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-cvr-quals-3.c | 25 +++++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-cvr-quals-4.c | 23 ++++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-debug-1.c | 7 ++
gcc/testsuite/gcc.dg/debug/ctf/ctf-debug-2.c | 7 ++
gcc/testsuite/gcc.dg/debug/ctf/ctf-enum-1.c | 21 ++++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-enum-2.c | 27 +++++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-file-scope-1.c | 25 +++++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-float-1.c | 16 +++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-forward-1.c | 40 +++++++++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-forward-2.c | 16 +++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-func-index-1.c | 25 +++++++
.../gcc.dg/debug/ctf/ctf-function-pointers-1.c | 24 +++++++
.../gcc.dg/debug/ctf/ctf-function-pointers-2.c | 22 ++++++
.../gcc.dg/debug/ctf/ctf-function-pointers-3.c | 21 ++++++
.../gcc.dg/debug/ctf/ctf-function-pointers-4.c | 18 +++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-functions-1.c | 34 +++++++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-int-1.c | 17 +++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-objt-index-1.c | 30 ++++++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-pointers-1.c | 26 +++++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-pointers-2.c | 25 +++++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-preamble-1.c | 11 +++
gcc/testsuite/gcc.dg/debug/ctf/ctf-skip-types-1.c | 38 ++++++++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-skip-types-2.c | 17 +++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-skip-types-3.c | 20 ++++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-skip-types-4.c | 19 +++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-skip-types-5.c | 19 +++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-skip-types-6.c | 18 +++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-skip-types-7.c | 18 +++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-skip-types-8.c | 27 +++++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-str-table-1.c | 26 +++++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-struct-1.c | 25 +++++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-struct-2.c | 32 +++++++++
.../gcc.dg/debug/ctf/ctf-struct-array-1.c | 65 +++++++++++++++++
.../gcc.dg/debug/ctf/ctf-struct-array-2.c | 15 ++++
.../gcc.dg/debug/ctf/ctf-struct-pointer-1.c | 21 ++++++
.../gcc.dg/debug/ctf/ctf-struct-pointer-2.c | 22 ++++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-typedef-1.c | 68 ++++++++++++++++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-typedef-2.c | 20 ++++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-typedef-3.c | 24 +++++++
.../gcc.dg/debug/ctf/ctf-typedef-struct-1.c | 14 ++++
.../gcc.dg/debug/ctf/ctf-typedef-struct-2.c | 17 +++++
.../gcc.dg/debug/ctf/ctf-typedef-struct-3.c | 32 +++++++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-union-1.c | 14 ++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-variables-1.c | 25 +++++++
gcc/testsuite/gcc.dg/debug/ctf/ctf-variables-2.c | 16 +++++
gcc/testsuite/gcc.dg/debug/ctf/ctf.exp | 41 +++++++++++
gcc/testsuite/lib/gcc-dg.exp | 64 +++++++++++++----
91 files changed, 2376 insertions(+), 15 deletions(-)
diff --git a/gcc/testsuite/gcc.dg/debug/btf/btf-1.c b/gcc/testsuite/gcc.dg/debug/btf/btf-1.c
new file mode 100644
index 00000000000..bcbc9492439
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/debug/btf/btf-1.c
@@ -0,0 +1,6 @@
+/* { dg-do compile } */
+/* { dg-options "-gbtf" } */
+
+void func(void)
+{
+}
diff --git a/gcc/testsuite/gcc.dg/debug/btf/btf-2.c b/gcc/testsuite/gcc.dg/debug/btf/btf-2.c
new file mode 100644
index 00000000000..70e2ff1e053
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/debug/btf/btf-2.c
@@ -0,0 +1,10 @@
+/* Check the BTF header information. */
+
+/* { dg-do compile } */
+/* { dg-options "-gbtf -dA" } */
+
+/* { dg-final { scan-assembler-times "0xeb9f.*btf_magic" 1} } */
+/* { dg-final { scan-assembler-times "0x1.*btf_version" 1 } } */
+/* { dg-final { scan-assembler-times "0.*btf_flags" 1 } } */
+
+int foo;
diff --git a/gcc/testsuite/gcc.dg/debug/btf/btf-anonymous-struct-1.c b/gcc/testsuite/gcc.dg/debug/btf/btf-anonymous-struct-1.c
new file mode 100644
index 00000000000..89a5701bba0
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/debug/btf/btf-anonymous-struct-1.c
@@ -0,0 +1,23 @@
+/* Test BTF generation of anonymous struct.
+
+ We expect two BTF struct records:
+ - struct foo, with two fields "a" and "bar"
+ - struct <anonymous> with one field "b"
+
+ The anonymous struct should have a name of 0, pointing to the null string
+ at the start of the string table. */
+
+/* { dg-do compile } */
+/* { dg-options "-O0 -gbtf -dA" } */
+
+/* Struct type with 2 members (struct foo). */
+/* { dg-final { scan-assembler-times "\[\t \]0x4000002\[\t \]+\[^\n\]*btt_info" 1 } } */
+/* Struct type with 1 member (anon struct). */
+/* { dg-final { scan-assembler-times "\[\t \]0x4000001\[\t \]+\[^\n\]*btt_info" 1 } } */
+/* { dg-final { scan-assembler-times "\[\t \]0\[\t \]+\[^\n\]*btt_name" 1 } } */
+
+struct foo
+{
+ int a;
+ struct { int b; } bar;
+} myfoo;
diff --git a/gcc/testsuite/gcc.dg/debug/btf/btf-anonymous-union-1.c b/gcc/testsuite/gcc.dg/debug/btf/btf-anonymous-union-1.c
new file mode 100644
index 00000000000..f3b120bb458
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/debug/btf/btf-anonymous-union-1.c
@@ -0,0 +1,23 @@
+/* Test BTF generation of anonymous union.
+
+ We expect a named struct type and an anonymous union type record to
+ be generated. The anonymous union record should have a name of 0,
+ pointing to the null string at the start of the string table. */
+
+/* { dg-do compile } */
+/* { dg-options "-O0 -gbtf -dA" } */
+
+/* Struct type with 1 member. */
+/* { dg-final { scan-assembler-times "\[\t \]0x4000001\[\t \]+\[^\n\]*btt_info" 1 } } */
+/* Union type with 2 members. */
+/* { dg-final { scan-assembler-times "\[\t \]0x5000002\[\t \]+\[^\n\]*btt_info" 1 } } */
+/* { dg-final { scan-assembler-times "\[\t \]0\[\t \]+\[^\n\]*btt_name" 1 } } */
+
+struct foo
+{
+ union
+ {
+ int value;
+ char ascii;
+ };
+} myfoo;
diff --git a/gcc/testsuite/gcc.dg/debug/btf/btf-array-1.c b/gcc/testsuite/gcc.dg/debug/btf/btf-array-1.c
new file mode 100644
index 00000000000..ab55445bd35
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/debug/btf/btf-array-1.c
@@ -0,0 +1,31 @@
+/* BTF generation for array type.
+
+ Unsized arrays are encoded with a 0 for the number of elements.
+
+ In this testcase, 5 distinct BTF records for arrays are expected
+ b1 : cta_nelems = 2
+ c1 : cta_nelems = 3
+ a1 : cta_nelems = 2, 5
+ buf : cta_nelems = 0. */
+
+/* { dg-do compile ) */
+/* { dg-options "-O0 -gbtf -dA" } */
+
+/* { dg-final { scan-assembler-times "0x3000000\[\t \]+\[^\n\]*btt_info" 5 } } */
+
+/* { dg-final { scan-assembler-times "\[\t \]0x2\[\t \]+\[^\n\]*bta_nelems" 2 } } */
+/* { dg-final { scan-assembler-times "\[\t \]0x3\[\t \]+\[^\n\]*bta_nelems" 1 } } */
+/* { dg-final { scan-assembler-times "\[\t \]0x5\[\t \]+\[^\n\]*bta_nelems" 1 } } */
+/* { dg-final { scan-assembler-times "\[\t \]0\[\t \]+\[^\n\]*bta_nelems" 1 } } */
+
+int b1[2] = {0,1};
+int c1[5] = {0,1,2,3,4};
+int a1[2][3] = { {3,4,5}, {2,3,4} };
+
+/* Variable length struct using arrays. */
+struct my_array
+{
+ int flags;
+ int length;
+ int buf[];
+} my_array_obj;
diff --git a/gcc/testsuite/gcc.dg/debug/btf/btf-bitfields-1.c b/gcc/testsuite/gcc.dg/debug/btf/btf-bitfields-1.c
new file mode 100644
index 00000000000..c6bf52130dc
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/debug/btf/btf-bitfields-1.c
@@ -0,0 +1,34 @@
+/* Basic tests for BTF bitfields.
+
+ The structure containing bitfield members should be marked with KIND_FLAG=1
+ The bitfield member offsets should be encoded as:
+ (bit_size << 24) | bit_offset
+ - (0xa << 24) | 0x20
+ - (0x7 << 24) | 0x2a
+ - (0x13 << 24) | 0x40 - note that this is aligned to 0x40. */
+
+/* { dg-do compile ) */
+/* { dg-options "-O0 -gbtf -dA" } */
+
+/* { dg-final { scan-assembler-times "\[\t \]0x84000004\[\t \]+\[^\n\]*btt_info" 1 } } */
+
+/* { dg-final { scan-assembler-times "\[\t \]0xa000020\[\t \]+\[^\n\]*btm_offset" 1 } } */
+/* { dg-final { scan-assembler-times "\[\t \]0x700002a\[\t \]+\[^\n\]*btm_offset" 1 } } */
+/* { dg-final { scan-assembler-times "\[\t \]0x13000040\[\t \]+\[^\n\]*btm_offset" 1 } } */
+
+struct bitt {
+ int a;
+ unsigned int bitfield_a : 10;
+ unsigned int bitfield_b : 7;
+ unsigned int bitfield_c : 19;
+} bitty;
+
+struct no_bitt {
+ int a;
+ int b;
+} no_bitty;
+
+int main ()
+{
+ return bitty.bitfield_b + bitty.a;
+}
diff --git a/gcc/testsuite/gcc.dg/debug/btf/btf-bitfields-2.c b/gcc/testsuite/gcc.dg/debug/btf/btf-bitfields-2.c
new file mode 100644
index 00000000000..9665ab67145
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/debug/btf/btf-bitfields-2.c
@@ -0,0 +1,26 @@
+/* Test BTF generation for struct with 0 size bitfield.
+
+ We expect a struct with 2 members to be generated. The size 0 bitfield
+ should not have any entry in the member list. */
+
+/* { dg-do compile ) */
+/* { dg-options "-O0 -gbtf -dA" } */
+
+/* Struct with bitfield members, and 2 members. */
+/* { dg-final { scan-assembler-times "\[\t \]0x84000002\[\t \]+\[^\n\]*btt_info" 1 } } */
+
+/* Bitfield size 31 (0x1f) at offset 0. */
+/* { dg-final { scan-assembler-times "\[\t \]0x1f000000\[\t \]+\[^\n\]*btm_offset" 1 } } */
+
+/* Bitfield size 32 (0x20) at offset 32. */
+/* { dg-final { scan-assembler-times "\[\t \]0x20000020\[\t \]+\[^\n\]*btm_offset" 1 } } */
+
+/* Only 2 members. */
+/* { dg-final { scan-assembler-times "btm_name" 2 } } */
+
+struct foo
+{
+ unsigned a : 31;
+ unsigned : 0;
+ unsigned c : 32;
+} myfoo;
diff --git a/gcc/testsuite/gcc.dg/debug/btf/btf-bitfields-3.c b/gcc/testsuite/gcc.dg/debug/btf/btf-bitfields-3.c
new file mode 100644
index 00000000000..440623c3b16
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/debug/btf/btf-bitfields-3.c
@@ -0,0 +1,43 @@
+/* Test BTF generation for enum-type bitfields
+
+ It is allowed to have a bitfield type be an enum type.
+ We expect the following types:
+
+ [1] enum 'foo'(1U#B) size=4U#B
+ 'BAR' value=0
+ 'BAZ' value=1
+ 'QUZ' value=2
+ 'QUX' value=3
+ [2] int 'unsigned int' size=4 offset=0 bits=32
+ [3] struct 'bitt' size=4
+ member 'f' type=1 bitfield_size=2 bit_offset=0
+ member 'data' type=2 bitfield_size=14 bit_offset=2
+ */
+
+/* { dg-do compile } */
+/* { dg-options "-O0 -gbtf -dA" } */
+
+/* Enum with 4 members. */
+/* { dg-final { scan-assembler-times "\[\t \]0x6000004\[\t \]+\[^\n\]*btt_info" 1 } } */
+/* Struct with bitfield members, and 2 members. */
+/* { dg-final { scan-assembler-times "\[\t \]0x84000002\[\t \]+\[^\n\]*btt_info" 1 } } */
+
+/* Bitfield "f" points to type ID 1. */
+/* { dg-final { scan-assembler-times "\[\t \]0x1\[\t \]+\[^\n\]*btm_type" 1 } } */
+
+/* Bitfield "data" points to type ID 2. */
+/* { dg-final { scan-assembler-times "\[\t \]0x2\[\t \]+\[^\n\]*btm_type" 1 } } */
+
+enum foo
+{
+ BAR = 0,
+ BAZ = 1,
+ QUZ = 2,
+ QUX = 3
+};
+
+struct bitt
+{
+ enum foo f : 2;
+ unsigned data : 14;
+} bitty;
diff --git a/gcc/testsuite/gcc.dg/debug/btf/btf-bitfields-4.c b/gcc/testsuite/gcc.dg/debug/btf/btf-bitfields-4.c
new file mode 100644
index 00000000000..af91845726f
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/debug/btf/btf-bitfields-4.c
@@ -0,0 +1,23 @@
+/* Test BTF generation for non-representable bitfields.
+
+ Due to the limitations of BTF, we only have 24 bits in which to store
+ the bitfield offset (in bits, from the beginning of the struct).
+
+ In this test, we construct a structure such that the bitfield will have
+ an offset so large as to be unrepresentable in BTF. We expect that the
+ resulting BTF will describe the rest of the structure, ignoring the
+ non-representable bitfield. */
+
+/* { dg-do compile } */
+/* { dg-options "-O0 -gbtf -dA" } */
+
+/* Struct with 3 members and no bitfield (kind_flag not set). */
+/* { dg-final { scan-assembler-times "\[\t \]0x4000003\[\t \]+\[^\n\]*btt_info" 1 } } */
+
+struct bigly
+{
+ int a;
+ int b[((0xffffff + 1) / (8 * sizeof (int)))];
+ unsigned unsup : 7;
+ char c;
+} big;
diff --git a/gcc/testsuite/gcc.dg/debug/btf/btf-cvr-quals-1.c b/gcc/testsuite/gcc.dg/debug/btf/btf-cvr-quals-1.c
new file mode 100644
index 00000000000..79e9f52a479
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/debug/btf/btf-cvr-quals-1.c
@@ -0,0 +1,52 @@
+/* Test BTF generation of BTF_KIND_{CONST,VOLATILE,RESTRICT} records.
+
+ BTF const, volatile and restrict records are nameless type records pointing
+ to the type they modify.
+
+ Types:
+ [1] int 'int' size=4U offset=0 bits=32 SIGNED
+ [2] const <anonymous> type=1
+ [3] volatile <anonymous> type=1
+ [4] const <anonymous> type=3
+ [5] ptr <anonymous> type=1
+ [6] restrict <anonymous> type=5
+ [7] ptr <anonymous> type=2
+ [8] restrict <anonymous> type=7
+
+ Note:
+ - Type id 3 describes a volatile int.
+ - Type id 2 describes a const int.
+ - Type id 4 describes a const volatile int by modifying id 3.
+ - Type id 6 describes a restrict pointer to int.
+ - Type id 8 describes a restrict pointer to const int.
+ */
+
+/* { dg-do compile } */
+/* { dg-options "-O0 -gbtf -dA" } */
+
+/* { dg-final { scan-assembler-times "ascii \"int.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */
+
+/* types 5 and 7 are pointers, to 'int' and 'const int' respectively. */
+/* { dg-final { scan-assembler-times "\[\t \]0x2000000\[\t \]+\[^\n\]*btt_info" 2 } } */
+
+/* type 3 has VOLATILE qualifier */
+/* { dg-final { scan-assembler-times "\[\t \]0x9000000\[\t \]+\[^\n\]*btt_info" 1 } } */
+
+/* types 2 and 4 have CONST qualifier. */
+/* { dg-final { scan-assembler-times "\[\t \]0xa000000\[\t \]+\[^\n\]*btt_info" 2 } } */
+
+/* types 6 and 8 have RESTRICT qualifier. */
+/* { dg-final { scan-assembler-times "\[\t \]0xb000000\[\t \]+\[^\n\]*btt_info" 2 } } */
+
+const int a = 10;
+
+volatile int b;
+
+int * restrict c;
+
+const volatile int d = 20;
+
+const int * restrict e;
+
+const int * f;
+int const * g;
diff --git a/gcc/testsuite/gcc.dg/debug/btf/btf-datasec-1.c b/gcc/testsuite/gcc.dg/debug/btf/btf-datasec-1.c
new file mode 100644
index 00000000000..88ae4c4edfd
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/debug/btf/btf-datasec-1.c
@@ -0,0 +1,45 @@
+/* BTF generation of BTF_KIND_DATASEC records.
+
+ We expect 3 DATASEC records: one for each of .data, .rodata and .bss.
+ .rodata: the consts; c,e,my_cstruct
+ .bss: a,b,bigarr
+ .data: d
+
+ The type IDs of the variables placed in each section are not deterministic
+ so we cannot check them.
+ */
+
+/* { dg-do compile ) */
+/* { dg-options "-O0 -gbtf -dA" } */
+
+/* Check for two DATASEC entries with vlen 3, and one with vlen 1. */
+/* { dg-final { scan-assembler-times "0xf000003\[\t \]+\[^\n\]*btt_info" 2 } } */
+/* { dg-final { scan-assembler-times "0xf000001\[\t \]+\[^\n\]*btt_info" 1 } } */
+
+/* The offset entry for each variable in a DATSEC should be 0 at compile time. */
+/* { dg-final { scan-assembler-times "0\[\t \]+\[^\n\]*bts_offset" 7 } } */
+
+/* Check that strings for each DATASEC have been added to the BTF string table. */
+/* { dg-final { scan-assembler-times "ascii \".data.0\"\[\t \]+\[^\n\]*btf_aux_string" 1 } } */
+/* { dg-final { scan-assembler-times "ascii \".rodata.0\"\[\t \]+\[^\n\]*btf_aux_string" 1 } } */
+/* { dg-final { scan-assembler-times "ascii \".bss.0\"\[\t \]+\[^\n\]*btf_aux_string" 1 } } */
+
+int a;
+long long b;
+const long unsigned int c;
+
+int d = 137;
+
+const int e = -55;
+
+int bigarr[20][10];
+
+struct c_struct {
+ long x;
+ char c;
+};
+
+const struct c_struct my_cstruct = {
+ 99,
+ '?'
+};
diff --git a/gcc/testsuite/gcc.dg/debug/btf/btf-enum-1.c b/gcc/testsuite/gcc.dg/debug/btf/btf-enum-1.c
new file mode 100644
index 00000000000..728493b0804
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/debug/btf/btf-enum-1.c
@@ -0,0 +1,30 @@
+/* Test BTF generation for enums. */
+
+/* { dg-do compile } */
+/* { dg-options "-O0 -gbtf -dA" } */
+
+/* { dg-final { scan-assembler-times "\[\t \]0x6000004\[\t \]+\[^\n\]*btt_info" 1 } } */
+/* { dg-final { scan-assembler-times "\[\t \]0x6000003\[\t \]+\[^\n\]*btt_info" 1 } } */
+/* { dg-final { scan-assembler-times "ascii \"QAD.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */
+/* { dg-final { scan-assembler-times "ascii \"QED.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */
+/* { dg-final { scan-assembler-times "ascii \"QOD.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */
+/* { dg-final { scan-assembler-times "ascii \"QUD.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */
+/* { dg-final { scan-assembler-times "ascii \"YES.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */
+/* { dg-final { scan-assembler-times "ascii \"NO.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */
+/* { dg-final { scan-assembler-times "ascii \"IDUNNO.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */
+/* { dg-final { scan-assembler-times "bte_value" 7 } } */
+
+enum foo
+{
+ QAD,
+ QED,
+ QOD,
+ QUD,
+} a;
+
+enum barsigned
+{
+ YES=1000,
+ NO=-1000,
+ IDUNNO=0,
+} b;
diff --git a/gcc/testsuite/gcc.dg/debug/btf/btf-forward-1.c b/gcc/testsuite/gcc.dg/debug/btf/btf-forward-1.c
new file mode 100644
index 00000000000..c894fa26bc7
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/debug/btf/btf-forward-1.c
@@ -0,0 +1,24 @@
+/* Test BTF generation of forwards.
+
+ Check that the KIND_FLAG (bit 31) of btt_info is set (1) for the forward to
+ union, and not set (0) for forward to struct. */
+
+/* { dg-do compile } */
+/* { dg-options "-O0 -gbtf -dA" } */
+
+/* { dg-final { scan-assembler-times "\[\t \]0x87000000\[\t \]+\[^\n\]*btt_info" 1 } } */
+/* { dg-final { scan-assembler-times "\[\t \]0x7000000\[\t \]+\[^\n\]*btt_info" 1 } } */
+
+typedef struct _fwd_st
+{
+ struct unk_struct_type *data[4];
+} fwd_st_t;
+
+fwd_st_t struct_container;
+
+typedef struct _fwd_un
+{
+ union unk_union_type *options[4];
+} fwd_un_t;
+
+fwd_un_t union_container;
diff --git a/gcc/testsuite/gcc.dg/debug/btf/btf-function-1.c b/gcc/testsuite/gcc.dg/debug/btf/btf-function-1.c
new file mode 100644
index 00000000000..9fa1498bd8e
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/debug/btf/btf-function-1.c
@@ -0,0 +1,18 @@
+/* Test BTF generation for functions.
+
+ We expect to see one BTF_KIND_FUNC_PROTO with 2 named arguments.
+ The parameter names should appear in the auxilliary string table. */
+
+/* { dg-do compile } */
+/* { dg-options "-O0 -gbtf -dA" } */
+
+/* { dg-final { scan-assembler-times "\[\t \]0xd000002\[\t \]+\[^\n\]*btt_info" 1 } } */
+/* { dg-final { scan-assembler-times "farg_name" 2 } } */
+/* { dg-final { scan-assembler-times "farg_type" 2 } } */
+/* { dg-final { scan-assembler-times "ascii \"alpha.0\"\[\t \]+\[^\n\]*btf_aux_string" 1 } } */
+/* { dg-final { scan-assembler-times "ascii \"bravo.0\"\[\t \]+\[^\n\]*btf_aux_string" 1 } } */
+
+int funfoo (int alpha, long bravo)
+{
+ return 0;
+}
diff --git a/gcc/testsuite/gcc.dg/debug/btf/btf-function-2.c b/gcc/testsuite/gcc.dg/debug/btf/btf-function-2.c
new file mode 100644
index 00000000000..3c7fda9ee35
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/debug/btf/btf-function-2.c
@@ -0,0 +1,18 @@
+/* Test BTF generation for functions with varargs.
+
+ We expect one BTF_KIND_FUNC_PROTO with two arguments. The second argument
+ should have "farg_name" and "farg_type" both of 0, representing varargs. */
+
+/* { dg-do compile } */
+/* { dg-options "-O0 -gbtf -dA" } */
+
+/* { dg-final { scan-assembler-times "\[\t \]0xd000002\[\t \]+\[^\n\]*btt_info" 1 } } */
+/* { dg-final { scan-assembler-times "farg_name" 2 } } */
+/* { dg-final { scan-assembler-times "farg_type" 2 } } */
+/* { dg-final { scan-assembler-times "\[\t \]0\[\t \]+\[^\n\]*farg_name" 1 } } */
+/* { dg-final { scan-assembler-times "\[\t \]0\[\t \]+\[^\n\]*farg_type" 1 } } */
+
+int fmt (const char * format, ...)
+{
+ return 0;
+}
diff --git a/gcc/testsuite/gcc.dg/debug/btf/btf-function-3.c b/gcc/testsuite/gcc.dg/debug/btf/btf-function-3.c
new file mode 100644
index 00000000000..35f96a2152c
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/debug/btf/btf-function-3.c
@@ -0,0 +1,22 @@
+/* Test BTF generation for a function with an unrepresentable parameter.
+
+ BTF has no encoding for floating point types, among others. Function
+ parameters of unrepresentable types are emitted as 'void' types.
+
+ We expect one BTF_KIND_FUNC_PROTO with 3 parameters, one of which
+ has type_id=0. */
+
+/* { dg-do compile } */
+/* { dg-options "-O0 -gbtf -dA" } */
+
+/* { dg-final { scan-assembler-times "\[\t \]0xd000003\[\t \]+\[^\n\]*btt_info" 1 } } */
+/* { dg-final { scan-assembler-times "farg_name" 3 } } */
+/* { dg-final { scan-assembler-times "farg_type" 3 } } */
+
+/* Exactly one function parameter should have type_id=0. */
+/* { dg-final { scan-assembler-times "\[\t \]0\[\t \]+\[^\n\]*farg_type" 1 } } */
+
+int foo (int a, float f, long b)
+{
+ return 0;
+}
diff --git a/gcc/testsuite/gcc.dg/debug/btf/btf-int-1.c b/gcc/testsuite/gcc.dg/debug/btf/btf-int-1.c
new file mode 100644
index 00000000000..2381decd6ff
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/debug/btf/btf-int-1.c
@@ -0,0 +1,44 @@
+/* Tests for BTF integer base types.
+
+ 0 f ff 00 ff
+ | 0 | encoding | offset | 00 | bits |
+ encoding:
+ signed 1 << 24
+ char 2 << 24
+
+ All offsets in this test should be 0.
+ This test does _not_ check number of bits, as it may vary between targets.
+ */
+
+/* { dg-do compile } */
+/* { dg-options "-O0 -gbtf -dA" } */
+
+/* Check for 8 BTF_KIND_INT types. */
+/* { dg-final { scan-assembler-times "\[\t \]0x1000000\[\t \]+\[^\n\]*btt_info" 8 } } */
+
+/* Check the signed/char flags, but not bit size. */
+/* { dg-final { scan-assembler-times "\[\t \]0x10000..\[\t \]+\[^\n\]*bti_encoding" 3 } } */
+/* { dg-final { scan-assembler-times "\[\t \]0x20000..\[\t \]+\[^\n\]*bti_encoding" 1 } } */
+/* { dg-final { scan-assembler-times "\[\t \]0x30000..\[\t \]+\[^\n\]*bti_encoding" 1 } } */
+
+/* Check that there is a string entry for each type name. */
+/* { dg-final { scan-assembler-times "ascii \"unsigned char.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */
+/* { dg-final { scan-assembler-times "ascii \"signed char.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */
+/* { dg-final { scan-assembler-times "ascii \"short unsigned int.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */
+/* { dg-final { scan-assembler-times "ascii \"short int.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */
+/* { dg-final { scan-assembler-times "ascii \"unsigned int.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */
+/* { dg-final { scan-assembler-times "ascii \"int.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */
+/* { dg-final { scan-assembler-times "ascii \"long unsigned int.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */
+/* { dg-final { scan-assembler-times "ascii \"long int.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */
+
+unsigned char a = 11;
+signed char b = -22;
+
+unsigned short c = 33;
+signed short d = 44;
+
+unsigned int e = 55;
+signed int f = -66;
+
+unsigned long int g = 77;
+signed long int h = 88;
diff --git a/gcc/testsuite/gcc.dg/debug/btf/btf-pointers-1.c b/gcc/testsuite/gcc.dg/debug/btf/btf-pointers-1.c
new file mode 100644
index 00000000000..a14ac0f89b2
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/debug/btf/btf-pointers-1.c
@@ -0,0 +1,25 @@
+/* Test BTF generation for pointer types.
+
+ Two pointer types are expected:
+ - int *
+ - struct st *
+ */
+
+/* { dg-do compile } */
+/* { dg-options "-O0 -gbtf -dA" } */
+
+/* { dg-final { scan-assembler-times "\[\t \]0x2000000\[\t \]+\[^\n\]*btt_info" 2 } } */
+/* { dg-final { scan-assembler-times "ascii \"int.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */
+/* { dg-final { scan-assembler-times "ascii \"st.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */
+
+int foo = 10;
+int *pfoo = &foo;
+
+struct st
+{
+ int a;
+ int *pb;
+ struct st * next;
+};
+
+struct st * bar;
diff --git a/gcc/testsuite/gcc.dg/debug/btf/btf-pointers-2.c b/gcc/testsuite/gcc.dg/debug/btf/btf-pointers-2.c
new file mode 100644
index 00000000000..c77b224d711
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/debug/btf/btf-pointers-2.c
@@ -0,0 +1,13 @@
+/* Test BTF generation for pointers to void.
+
+ In this test, we expect that the pointer references type ID 0, the reserved
+ void typeid, and that no intermediate type is generated for void. */
+
+/* { dg-do compile } */
+/* { dg-options "-O0 -gbtf -dA" } */
+
+/* { dg-final { scan-assembler-times "\[\t \]0x2000000\[\t \]+\[^\n\]*btt_info" 1 } } */
+
+/* { dg-final { scan-assembler-times "\[\t \]0x1000000\[\t \]+\[^\n\]*btt_info" 0 } } */
+
+void *ptr;
diff --git a/gcc/testsuite/gcc.dg/debug/btf/btf-struct-1.c b/gcc/testsuite/gcc.dg/debug/btf/btf-struct-1.c
new file mode 100644
index 00000000000..bc3281437c9
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/debug/btf/btf-struct-1.c
@@ -0,0 +1,22 @@
+/* Test BTF generation of struct type.
+
+ Two BTF_KIND_STRUCT records are expected.
+ - struct foo with 3 members
+ - struct data with 2 members */
+
+/* { dg-do compile } */
+/* { dg-options "-O0 -gbtf -dA" } */
+
+/* { dg-final { scan-assembler-times "\[\t \]0x4000003\[\t \]+\[^\n\]*btt_info" 1 } } */
+/* { dg-final { scan-assembler-times "\[\t \]0x4000002\[\t \]+\[^\n\]*btt_info" 1 } } */
+/* { dg-final { scan-assembler-times "btm_name" 5 } } */
+
+struct foo
+{
+ int after;
+ int before;
+ struct {
+ unsigned short n_valid;
+ int set[10];
+ } data;
+} my_foo;
diff --git a/gcc/testsuite/gcc.dg/debug/btf/btf-struct-2.c b/gcc/testsuite/gcc.dg/debug/btf/btf-struct-2.c
new file mode 100644
index 00000000000..24514fcb31e
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/debug/btf/btf-struct-2.c
@@ -0,0 +1,19 @@
+/* Test BTF generation for struct type with a member which refers to an
+ unsupported type.
+
+ BTF does not support floating point types (among other things). When
+ generating BTF for a struct (or union) type, members which refer to
+ unsupported types should be skipped. */
+
+/* { dg-do compile } */
+/* { dg-options "-O0 -gbtf -dA" } */
+
+/* Expect a struct with only 2 members - 'f' should not be present. */
+/* { dg-final { scan-assembler-times "\[\t \]0x4000002\[\t \]+\[^\n\]*btt_info" 1 } } */
+
+struct with_float
+{
+ int a;
+ float f;
+ char c;
+} instance;
diff --git a/gcc/testsuite/gcc.dg/debug/btf/btf-typedef-1.c b/gcc/testsuite/gcc.dg/debug/btf/btf-typedef-1.c
new file mode 100644
index 00000000000..472cc63f600
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/debug/btf/btf-typedef-1.c
@@ -0,0 +1,82 @@
+/* Test BTF generation for BTF_KIND_TYPEDEF records.
+
+ 7 typedef records are expected. We expect the following types (among others):
+ [1] int 'int' size=4 offset=0 bits=32 SIGNED
+ [2] typedef 'my_int' type=1
+ [3] typedef 'foo_int' type=1
+ [4] typedef 'bar_int' type=1
+ ..
+ [6] typedef 'CBAR' type=5
+ ..
+ [8] typedef 'CBARP' type=7
+ [9] struct '_node' size=16
+ ..
+ [11] typedef 'node_t' type=9
+ [12] struct '_arena'
+ ..
+ [15] typedef 'arena_t' type=12
+ [16] var 'a' type=2 linkage=1 (global)
+ [17] var 'suitcase' type=15 linkage=1 (global)
+ [18] var 'b' type=3 linkage=1 (global)
+ [19] var 'c' type=4 linkage=1 (global)
+ [20] var 'd' type=11 linkage=1 (global)
+ [21] var 'destination' type=6 linkage=1 (global)
+ [22] var 'ticket' type=8 linkage=1 (global)
+
+ Note that the order of the variables is not guaranteed, so we do not check
+ particular variables have exactly the right typedef. Instead, we check:
+ 1. 7 typedef records are generated, along with the correct strings for them.
+ 2. There is one variable pointing to each typedef. */
+
+/* { dg-do compile } */
+/* { dg-options "-O0 -gbtf -dA" } */
+
+/* { dg-final { scan-assembler-times "\[\t \]0x8000000\[\t \]+\[^\n\]*btt_info" 7 } } */
+
+/* { dg-final { scan-assembler-times "ascii \"my_int.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */
+/* { dg-final { scan-assembler-times "ascii \"foo_int.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */
+/* { dg-final { scan-assembler-times "ascii \"bar_int.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */
+/* { dg-final { scan-assembler-times "ascii \"CBAR.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */
+/* { dg-final { scan-assembler-times "ascii \"CBARP.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */
+/* { dg-final { scan-assembler-times "ascii \"node_t.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */
+/* { dg-final { scan-assembler-times "ascii \"arena_t.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */
+
+/* { dg-final { scan-assembler-times "\[\t \]0x2\[\t \]+\[^\n\]*btv_type" 1 } } */
+/* { dg-final { scan-assembler-times "\[\t \]0x3\[\t \]+\[^\n\]*btv_type" 1 } } */
+/* { dg-final { scan-assembler-times "\[\t \]0x4\[\t \]+\[^\n\]*btv_type" 1 } } */
+/* { dg-final { scan-assembler-times "\[\t \]0x6\[\t \]+\[^\n\]*btv_type" 1 } } */
+/* { dg-final { scan-assembler-times "\[\t \]0x8\[\t \]+\[^\n\]*btv_type" 1 } } */
+/* { dg-final { scan-assembler-times "\[\t \]0xb\[\t \]+\[^\n\]*btv_type" 1 } } */
+/* { dg-final { scan-assembler-times "\[\t \]0xf\[\t \]+\[^\n\]*btv_type" 1 } } */
+
+typedef int my_int;
+typedef int foo_int;
+typedef int bar_int;
+
+typedef const bar_int CBAR;
+typedef const bar_int * CBARP;
+
+typedef struct _node
+{
+ foo_int name_off;
+ bar_int info;
+ struct _node * next;
+} node_t;
+
+
+typedef struct _arena
+{
+ node_t nodes[16];
+ my_int vardata;
+ bar_int flags;
+} arena_t;
+
+my_int a;
+foo_int b;
+bar_int c;
+node_t d;
+
+CBAR destination;
+CBARP ticket = &destination;
+
+arena_t suitcase;
diff --git a/gcc/testsuite/gcc.dg/debug/btf/btf-union-1.c b/gcc/testsuite/gcc.dg/debug/btf/btf-union-1.c
new file mode 100644
index 00000000000..d66843717b3
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/debug/btf/btf-union-1.c
@@ -0,0 +1,16 @@
+/* Test BTF generation for union type. */
+
+/* { dg-do compile ) */
+/* { dg-options "-O0 -gbtf -dA" } */
+
+/* One union type with 4 members */
+/* { dg-final { scan-assembler-times "\[\t \]0x5000004\[\t \]+\[^\n\]*btt_info" 1 } } */
+/* { dg-final { scan-assembler-times "btm_name" 4 } } */
+
+union onion
+{
+ int redness;
+ char *name;
+ unsigned short freshness;
+ unsigned short flavor;
+} my_onion;
diff --git a/gcc/testsuite/gcc.dg/debug/btf/btf-variables-1.c b/gcc/testsuite/gcc.dg/debug/btf/btf-variables-1.c
new file mode 100644
index 00000000000..a79ed1d53b7
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/debug/btf/btf-variables-1.c
@@ -0,0 +1,33 @@
+/* BTF generation for variables. */
+
+/* { dg-do compile } */
+/* { dg-options "-O0 -gbtf -dA" } */
+
+/* We expect 6 variables */
+/* { dg-final { scan-assembler-times "\[\t \]0xe000000\[\t \]+\[^\n\]*btv_info" 6 } } */
+
+unsigned int x1;
+
+struct st
+{
+ int a;
+ int b;
+};
+
+union {
+ long int value;
+ struct st * pointer;
+} bar;
+
</cut>
3 years, 10 months
- 1
- 0
[CI-NOTIFY]: TCWG Bisect tcwg_bmk_tk1/gnu-release-arm-spec2k6-O3 - Build # 24 - Successful!
by ci_notify＠linaro.org
Successfully identified regression in *gcc* in CI configuration tcwg_bmk_gnu_tk1/gnu-release-arm-spec2k6-O3. So far, this commit has regressed CI configurations:
- tcwg_bmk_gnu_tk1/gnu-release-arm-spec2k6-O3
Culprit:
<cut>
commit a20f263ba1a76af40eb4e6734529739a2a30ed65
Author: Jan Hubicka <hubicka(a)ucw.cz>
Date: Sun Jul 14 13:57:10 2019 +0200
ipa-fnsummary.c (ipa_dump_hints): Do not dump array_index.
* ipa-fnsummary.c (ipa_dump_hints): Do not dump array_index.
(ipa_fn_summary::~ipa_fn_summary): Do not destroy array_index.
(ipa_fn_summary_t::duplicate): Do not duplicate array_index.
(array_index_predicate): Remove.
(analyze_function_body): Account cost for variable ofsetted array
indexing.
(estimate_node_size_and_time): Do not compute array index hint.
(ipa_merge_fn_summary_after_inlining): Do not merge array index hint.
(inline_read_section): Do not read array index hint.
(ipa_fn_summary_write): Do not write array index hint.
* doc/invoke.texi (ipa-cp-array-index-hint-bonus): Remove.
* ipa-cp.c (hint_time_bonus): Remove.
* ipa-fnsummary.h (ipa_hints_vals): Remove array_index.
(ipa_fnsummary): Remove array_index.
* ipa-inline.c (want_inline_small_function_p): Do not use
array_index.
(edge_badness): Likewise.
* params.def (PARAM_IPA_CP_ARRAY_INDEX_HINT_BONUS): Remove.
From-SVN: r273479
</cut>
Results regressed to (for first_bad == a20f263ba1a76af40eb4e6734529739a2a30ed65)
# reset_artifacts:
-10
# build_abe binutils:
-9
# build_abe stage1 -- --set gcc_override_configure=--with-mode=arm --set gcc_override_configure=--disable-libsanitizer:
-8
# build_abe linux:
-7
# build_abe glibc:
-6
# build_abe stage2 -- --set gcc_override_configure=--with-mode=arm --set gcc_override_configure=--disable-libsanitizer:
-5
# true:
0
# benchmark -O3_marm -- artifacts/build-a20f263ba1a76af40eb4e6734529739a2a30ed65/results_id:
1
# 410.bwaves,[.] mat_times_vec_ regressed by 195
from (for last_good == d67dfb85ba4f89f5f3045f2483005c290bc18108)
# reset_artifacts:
-10
# build_abe binutils:
-9
# build_abe stage1 -- --set gcc_override_configure=--with-mode=arm --set gcc_override_configure=--disable-libsanitizer:
-8
# build_abe linux:
-7
# build_abe glibc:
-6
# build_abe stage2 -- --set gcc_override_configure=--with-mode=arm --set gcc_override_configure=--disable-libsanitizer:
-5
# true:
0
# benchmark -O3_marm -- artifacts/build-d67dfb85ba4f89f5f3045f2483005c290bc18108/results_id:
1
Artifacts of last_good build: https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tk1-gnu-release-a…
Results ID of last_good: tk1_32/tcwg_bmk_gnu_tk1/bisect-gnu-release-arm-spec2k6-O3/753
Artifacts of first_bad build: https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tk1-gnu-release-a…
Results ID of first_bad: tk1_32/tcwg_bmk_gnu_tk1/bisect-gnu-release-arm-spec2k6-O3/758
Build top page/logs: https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tk1-gnu-release-a…
Configuration details:
Reproduce builds:
<cut>
mkdir investigate-gcc-a20f263ba1a76af40eb4e6734529739a2a30ed65
cd investigate-gcc-a20f263ba1a76af40eb4e6734529739a2a30ed65
git clone https://git.linaro.org/toolchain/jenkins-scripts
mkdir -p artifacts/manifests
curl -o artifacts/manifests/build-baseline.sh https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tk1-gnu-release-a… --fail
curl -o artifacts/manifests/build-parameters.sh https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tk1-gnu-release-a… --fail
curl -o artifacts/test.sh https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tk1-gnu-release-a… --fail
chmod +x artifacts/test.sh
# Reproduce the baseline build (build all pre-requisites)
./jenkins-scripts/tcwg_bmk-build.sh @@ artifacts/manifests/build-baseline.sh
cd gcc
# Reproduce first_bad build
git checkout --detach a20f263ba1a76af40eb4e6734529739a2a30ed65
../artifacts/test.sh
# Reproduce last_good build
git checkout --detach d67dfb85ba4f89f5f3045f2483005c290bc18108
../artifacts/test.sh
cd ..
</cut>
History of pending regressions and results: https://git.linaro.org/toolchain/ci/base-artifacts.git/log/?h=linaro-local/…
Artifacts: https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tk1-gnu-release-a…
Build log: https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tk1-gnu-release-a…
Full commit (up to 1000 lines):
<cut>
commit a20f263ba1a76af40eb4e6734529739a2a30ed65
Author: Jan Hubicka <hubicka(a)ucw.cz>
Date: Sun Jul 14 13:57:10 2019 +0200
ipa-fnsummary.c (ipa_dump_hints): Do not dump array_index.
* ipa-fnsummary.c (ipa_dump_hints): Do not dump array_index.
(ipa_fn_summary::~ipa_fn_summary): Do not destroy array_index.
(ipa_fn_summary_t::duplicate): Do not duplicate array_index.
(array_index_predicate): Remove.
(analyze_function_body): Account cost for variable ofsetted array
indexing.
(estimate_node_size_and_time): Do not compute array index hint.
(ipa_merge_fn_summary_after_inlining): Do not merge array index hint.
(inline_read_section): Do not read array index hint.
(ipa_fn_summary_write): Do not write array index hint.
* doc/invoke.texi (ipa-cp-array-index-hint-bonus): Remove.
* ipa-cp.c (hint_time_bonus): Remove.
* ipa-fnsummary.h (ipa_hints_vals): Remove array_index.
(ipa_fnsummary): Remove array_index.
* ipa-inline.c (want_inline_small_function_p): Do not use
array_index.
(edge_badness): Likewise.
* params.def (PARAM_IPA_CP_ARRAY_INDEX_HINT_BONUS): Remove.
From-SVN: r273479
---
gcc/ChangeLog | 21 ++++++++++
gcc/doc/invoke.texi | 6 ---
gcc/ipa-cp.c | 2 -
gcc/ipa-fnsummary.c | 109 +++++++++++++++-------------------------------------
gcc/ipa-fnsummary.h | 11 ++----
gcc/ipa-inline.c | 3 --
gcc/params.def | 6 ---
7 files changed, 54 insertions(+), 104 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9376ab41542..9b5cc7a5b5b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,24 @@
+2019-07-14 Jan Hubicka <hubicka(a)ucw.cz>
+
+ * ipa-fnsummary.c (ipa_dump_hints): Do not dump array_index.
+ (ipa_fn_summary::~ipa_fn_summary): Do not destroy array_index.
+ (ipa_fn_summary_t::duplicate): Do not duplicate array_index.
+ (array_index_predicate): Remove.
+ (analyze_function_body): Account cost for variable ofsetted array
+ indexing.
+ (estimate_node_size_and_time): Do not compute array index hint.
+ (ipa_merge_fn_summary_after_inlining): Do not merge array index hint.
+ (inline_read_section): Do not read array index hint.
+ (ipa_fn_summary_write): Do not write array index hint.
+ * doc/invoke.texi (ipa-cp-array-index-hint-bonus): Remove.
+ * ipa-cp.c (hint_time_bonus): Remove.
+ * ipa-fnsummary.h (ipa_hints_vals): Remove array_index.
+ (ipa_fnsummary): Remove array_index.
+ * ipa-inline.c (want_inline_small_function_p): Do not use
+ array_index.
+ (edge_badness): Likewise.
+ * params.def (PARAM_IPA_CP_ARRAY_INDEX_HINT_BONUS): Remove.
+
2019-07-14 Segher Boessenkool <segher(a)kernel.crashing.org>
PR target/91148
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index b4e71f2c8fd..758aef36bd8 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -11895,12 +11895,6 @@ of iterations of a loop known, it adds a bonus of
@option{ipa-cp-loop-hint-bonus} to the profitability score of
the candidate.
-@item ipa-cp-array-index-hint-bonus
-When IPA-CP determines that a cloning candidate would make the index of
-an array access known, it adds a bonus of
-@option{ipa-cp-array-index-hint-bonus} to the profitability
-score of the candidate.
-
@item ipa-max-aa-steps
During its analysis of function bodies, IPA-CP employs alias analysis
in order to track values pointed to by function parameters. In order
diff --git a/gcc/ipa-cp.c b/gcc/ipa-cp.c
index 0fd36506c00..b20a6d08794 100644
--- a/gcc/ipa-cp.c
+++ b/gcc/ipa-cp.c
@@ -2607,8 +2607,6 @@ hint_time_bonus (ipa_hints hints)
int result = 0;
if (hints & (INLINE_HINT_loop_iterations | INLINE_HINT_loop_stride))
result += PARAM_VALUE (PARAM_IPA_CP_LOOP_HINT_BONUS);
- if (hints & INLINE_HINT_array_index)
- result += PARAM_VALUE (PARAM_IPA_CP_ARRAY_INDEX_HINT_BONUS);
return result;
}
diff --git a/gcc/ipa-fnsummary.c b/gcc/ipa-fnsummary.c
index 09986211a1d..78eb8cb6f50 100644
--- a/gcc/ipa-fnsummary.c
+++ b/gcc/ipa-fnsummary.c
@@ -134,11 +134,6 @@ ipa_dump_hints (FILE *f, ipa_hints hints)
hints &= ~INLINE_HINT_declared_inline;
fprintf (f, " declared_inline");
}
- if (hints & INLINE_HINT_array_index)
- {
- hints &= ~INLINE_HINT_array_index;
- fprintf (f, " array_index");
- }
if (hints & INLINE_HINT_known_hot)
{
hints &= ~INLINE_HINT_known_hot;
@@ -549,8 +544,6 @@ ipa_fn_summary::~ipa_fn_summary ()
edge_predicate_pool.remove (loop_iterations);
if (loop_stride)
edge_predicate_pool.remove (loop_stride);
- if (array_index)
- edge_predicate_pool.remove (array_index);
vec_free (conds);
vec_free (size_time_table);
}
@@ -703,8 +696,6 @@ ipa_fn_summary_t::duplicate (cgraph_node *src,
possible_truths);
remap_hint_predicate_after_duplication (&info->loop_stride,
possible_truths);
- remap_hint_predicate_after_duplication (&info->array_index,
- possible_truths);
/* If inliner or someone after inliner will ever start producing
non-trivial clones, we will get trouble with lack of information
@@ -727,12 +718,6 @@ ipa_fn_summary_t::duplicate (cgraph_node *src,
info->loop_stride = NULL;
set_hint_predicate (&info->loop_stride, p);
}
- if (info->array_index)
- {
- predicate p = *info->array_index;
- info->array_index = NULL;
- set_hint_predicate (&info->array_index, p);
- }
}
if (!dst->global.inlined_to)
ipa_update_overall_fn_summary (dst);
@@ -894,11 +879,6 @@ ipa_dump_fn_summary (FILE *f, struct cgraph_node *node)
fprintf (f, " loop stride:");
s->loop_stride->dump (f, s->conds);
}
- if (s->array_index)
- {
- fprintf (f, " array index:");
- s->array_index->dump (f, s->conds);
- }
fprintf (f, " calls:\n");
dump_ipa_call_summary (f, 4, node, s);
fprintf (f, "\n");
@@ -1824,27 +1804,6 @@ predicate_for_phi_result (class ipa_fn_summary *summary, gphi *phi,
nonconstant_names[SSA_NAME_VERSION (gimple_phi_result (phi))] = *p;
}
-/* Return predicate specifying when array index in access OP becomes non-constant. */
-
-static predicate
-array_index_predicate (ipa_fn_summary *info,
- vec< predicate> nonconstant_names, tree op)
-{
- predicate p = false;
- while (handled_component_p (op))
- {
- if (TREE_CODE (op) == ARRAY_REF || TREE_CODE (op) == ARRAY_RANGE_REF)
- {
- if (TREE_CODE (TREE_OPERAND (op, 1)) == SSA_NAME)
- p = p.or_with (info->conds,
- nonconstant_names[SSA_NAME_VERSION
- (TREE_OPERAND (op, 1))]);
- }
- op = TREE_OPERAND (op, 0);
- }
- return p;
-}
-
/* For a typical usage of __builtin_expect (a<b, 1), we
may introduce an extra relation stmt:
With the builtin, we have
@@ -2001,7 +1960,6 @@ analyze_function_body (struct cgraph_node *node, bool early)
vec<predicate> nonconstant_names = vNULL;
int nblocks, n;
int *order;
- predicate array_index = true;
gimple *fix_builtin_expect_stmt;
gcc_assert (my_function && my_function->cfg);
@@ -2146,26 +2104,6 @@ analyze_function_body (struct cgraph_node *node, bool early)
this_time);
}
- if (gimple_assign_load_p (stmt) && nonconstant_names.exists ())
- {
- predicate this_array_index;
- this_array_index =
- array_index_predicate (info, nonconstant_names,
- gimple_assign_rhs1 (stmt));
- if (this_array_index != false)
- array_index &= this_array_index;
- }
- if (gimple_store_p (stmt) && nonconstant_names.exists ())
- {
- predicate this_array_index;
- this_array_index =
- array_index_predicate (info, nonconstant_names,
- gimple_get_lhs (stmt));
- if (this_array_index != false)
- array_index &= this_array_index;
- }
-
-
if (is_gimple_call (stmt)
&& !gimple_call_internal_p (stmt))
{
@@ -2273,14 +2211,40 @@ analyze_function_body (struct cgraph_node *node, bool early)
if (dump_file)
fprintf (dump_file, " fp_expression set\n");
}
+ }
- gcc_assert (time >= 0);
- gcc_assert (size >= 0);
+ /* Account cost of address calculations in the statements. */
+ for (unsigned int i = 0; i < gimple_num_ops (stmt); i++)
+ {
+ for (tree op = gimple_op (stmt, i);
+ op && handled_component_p (op);
+ op = TREE_OPERAND (op, 0))
+ if ((TREE_CODE (op) == ARRAY_REF
+ || TREE_CODE (op) == ARRAY_RANGE_REF)
+ && TREE_CODE (TREE_OPERAND (op, 1)) == SSA_NAME)
+ {
+ predicate p = bb_predicate;
+ if (fbi.info)
+ p = p & will_be_nonconstant_expr_predicate
+ (&fbi, info, TREE_OPERAND (op, 1),
+ nonconstant_names);
+ if (p != false)
+ {
+ time += freq;
+ size += 1;
+ if (dump_file)
+ fprintf (dump_file,
+ "\t\tAccounting address calculation.\n");
+ info->account_size_time (ipa_fn_summary::size_scale,
+ freq,
+ bb_predicate,
+ p);
+ }
+ }
}
+
}
}
- set_hint_predicate (&ipa_fn_summaries->get_create (node)->array_index,
- array_index);
free (order);
if (nonconstant_names.exists () && !early)
@@ -2783,9 +2747,6 @@ estimate_node_size_and_time (struct cgraph_node *node,
if (info->loop_stride
&& !info->loop_stride->evaluate (possible_truths))
hints |= INLINE_HINT_loop_stride;
- if (info->array_index
- && !info->array_index->evaluate (possible_truths))
- hints |= INLINE_HINT_array_index;
if (info->scc_no)
hints |= INLINE_HINT_in_scc;
if (DECL_DECLARED_INLINE_P (node->decl))
@@ -3106,9 +3067,6 @@ ipa_merge_fn_summary_after_inlining (struct cgraph_edge *edge)
remap_hint_predicate (info, callee_info,
&callee_info->loop_stride,
operand_map, offset_map, clause, &toplev_predicate);
- remap_hint_predicate (info, callee_info,
- &callee_info->array_index,
- operand_map, offset_map, clause, &toplev_predicate);
ipa_call_summary *s = ipa_call_summaries->get (edge);
inline_update_callee_summaries (edge->callee, s->loop_depth);
@@ -3366,9 +3324,6 @@ inline_read_section (struct lto_file_decl_data *file_data, const char *data,
p.stream_in (&ib);
if (info)
set_hint_predicate (&info->loop_stride, p);
- p.stream_in (&ib);
- if (info)
- set_hint_predicate (&info->array_index, p);
for (e = node->callees; e; e = e->next_callee)
read_ipa_call_summary (&ib, e, info != NULL);
for (e = node->indirect_calls; e; e = e->next_callee)
@@ -3517,10 +3472,6 @@ ipa_fn_summary_write (void)
info->loop_stride->stream_out (ob);
else
streamer_write_uhwi (ob, 0);
- if (info->array_index)
- info->array_index->stream_out (ob);
- else
- streamer_write_uhwi (ob, 0);
for (edge = cnode->callees; edge; edge = edge->next_callee)
write_ipa_call_summary (ob, edge);
for (edge = cnode->indirect_calls; edge; edge = edge->next_callee)
diff --git a/gcc/ipa-fnsummary.h b/gcc/ipa-fnsummary.h
index 55bc34146aa..173d3f2a652 100644
--- a/gcc/ipa-fnsummary.h
+++ b/gcc/ipa-fnsummary.h
@@ -48,11 +48,8 @@ enum ipa_hints_vals {
if functions are in different modules, inlining may not be so important.
Set by simple_edge_hints in ipa-inline-analysis.c. */
INLINE_HINT_cross_module = 64,
- /* If array indexes of loads/stores become known there may be room for
- further optimization. */
- INLINE_HINT_array_index = 128,
/* We know that the callee is hot by profile. */
- INLINE_HINT_known_hot = 256
+ INLINE_HINT_known_hot = 128
};
typedef int ipa_hints;
@@ -97,7 +94,7 @@ public:
fp_expressions (false), estimated_stack_size (false),
stack_frame_offset (false), time (0), size (0), conds (NULL),
size_time_table (NULL), loop_iterations (NULL), loop_stride (NULL),
- array_index (NULL), growth (0), scc_no (0)
+ growth (0), scc_no (0)
{
}
@@ -111,7 +108,7 @@ public:
stack_frame_offset (s.stack_frame_offset), time (s.time), size (s.size),
conds (s.conds), size_time_table (s.size_time_table),
loop_iterations (s.loop_iterations), loop_stride (s.loop_stride),
- array_index (s.array_index), growth (s.growth), scc_no (s.scc_no)
+ growth (s.growth), scc_no (s.scc_no)
{}
/* Default constructor. */
@@ -157,8 +154,6 @@ public:
/* Predicate on when some loop in the function becomes to have known
stride. */
predicate * GTY((skip)) loop_stride;
- /* Predicate on when some array indexes become constants. */
- predicate * GTY((skip)) array_index;
/* Estimated growth for inlining all copies of the function before start
of small functions inlining.
This value will get out of date as the callers are duplicated, but
diff --git a/gcc/ipa-inline.c b/gcc/ipa-inline.c
index 939d86ef94a..e73006662ad 100644
--- a/gcc/ipa-inline.c
+++ b/gcc/ipa-inline.c
@@ -807,7 +807,6 @@ want_inline_small_function_p (struct cgraph_edge *e, bool report)
|| (!(hints & (INLINE_HINT_indirect_call
| INLINE_HINT_known_hot
| INLINE_HINT_loop_iterations
- | INLINE_HINT_array_index
| INLINE_HINT_loop_stride))
&& !(big_speedup = big_speedup_p (e)))))
{
@@ -833,7 +832,6 @@ want_inline_small_function_p (struct cgraph_edge *e, bool report)
&& !(hints & INLINE_HINT_known_hot)
&& growth >= ((hints & (INLINE_HINT_indirect_call
| INLINE_HINT_loop_iterations
- | INLINE_HINT_array_index
| INLINE_HINT_loop_stride))
? MAX (MAX_INLINE_INSNS_AUTO,
MAX_INLINE_INSNS_SINGLE)
@@ -1227,7 +1225,6 @@ edge_badness (struct cgraph_edge *edge, bool dump)
badness = badness.shift (badness > 0 ? 4 : -4);
if ((hints & (INLINE_HINT_indirect_call
| INLINE_HINT_loop_iterations
- | INLINE_HINT_array_index
| INLINE_HINT_loop_stride))
|| callee_info->growth <= 0)
badness = badness.shift (badness > 0 ? -2 : 2);
diff --git a/gcc/params.def b/gcc/params.def
index c56055da9d9..7d0dcae0aee 100644
--- a/gcc/params.def
+++ b/gcc/params.def
@@ -1109,12 +1109,6 @@ DEFPARAM (PARAM_IPA_CP_LOOP_HINT_BONUS,
"bounds or strides known.",
64, 0, 0)
-DEFPARAM (PARAM_IPA_CP_ARRAY_INDEX_HINT_BONUS,
- "ipa-cp-array-index-hint-bonus",
- "Compile-time bonus IPA-CP assigns to candidates which make an array "
- "index known.",
- 48, 0, 0)
-
DEFPARAM (PARAM_IPA_MAX_AA_STEPS,
"ipa-max-aa-steps",
"Maximum number of statements that will be visited by IPA formal "
</cut>
3 years, 10 months
- 1
- 0
[CI-NOTIFY]: TCWG Bisect tcwg_bmk_tx1/llvm-release-aarch64-spec2k6-Oz - Build # 8 - Fixed!
by ci_notify＠linaro.org
Successfully identified regression in *llvm* in CI configuration tcwg_bmk_llvm_tx1/llvm-release-aarch64-spec2k6-Oz. So far, this commit has regressed CI configurations:
- tcwg_bmk_llvm_tx1/llvm-release-aarch64-spec2k6-Oz
Culprit:
<cut>
commit 4b1120159274ca98b4a58064b116aba88372ac98
Author: Michael Liao <michael.hliao(a)gmail.com>
Date: Mon Oct 12 10:01:40 2020 -0400
[MachineInstr] Add support for instructions with multiple memory operands.
- Basically iterate each pair of memory operands from both instructions
and return true if any of them may alias.
- The exception are memory instructions without any memory operand. They
may touch everything and could alias to any memory instruction.
Differential Revision: https://reviews.llvm.org/D89447
</cut>
Results regressed to (for first_bad == 4b1120159274ca98b4a58064b116aba88372ac98)
# reset_artifacts:
-10
# build_abe binutils:
-9
# build_abe stage1 -- --set gcc_override_configure=--disable-libsanitizer:
-8
# build_abe linux:
-7
# build_abe glibc:
-6
# build_abe stage2 -- --set gcc_override_configure=--disable-libsanitizer:
-5
# build_llvm true:
-3
# true:
0
# benchmark -Oz -- artifacts/build-4b1120159274ca98b4a58064b116aba88372ac98/results_id:
1
# 445.gobmk,[.] do_play_move regressed by 111
from (for last_good == cb9d0e8819ad7ca2f349a57d62ea2af02d631dfa)
# reset_artifacts:
-10
# build_abe binutils:
-9
# build_abe stage1 -- --set gcc_override_configure=--disable-libsanitizer:
-8
# build_abe linux:
-7
# build_abe glibc:
-6
# build_abe stage2 -- --set gcc_override_configure=--disable-libsanitizer:
-5
# build_llvm true:
-3
# true:
0
# benchmark -Oz -- artifacts/build-cb9d0e8819ad7ca2f349a57d62ea2af02d631dfa/results_id:
1
Artifacts of last_good build: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tx1-llvm-release…
Results ID of last_good: tx1_64/tcwg_bmk_llvm_tx1/bisect-llvm-release-aarch64-spec2k6-Oz/744
Artifacts of first_bad build: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tx1-llvm-release…
Results ID of first_bad: tx1_64/tcwg_bmk_llvm_tx1/bisect-llvm-release-aarch64-spec2k6-Oz/734
Build top page/logs: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tx1-llvm-release…
Configuration details:
Reproduce builds:
<cut>
mkdir investigate-llvm-4b1120159274ca98b4a58064b116aba88372ac98
cd investigate-llvm-4b1120159274ca98b4a58064b116aba88372ac98
git clone https://git.linaro.org/toolchain/jenkins-scripts
mkdir -p artifacts/manifests
curl -o artifacts/manifests/build-baseline.sh https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tx1-llvm-release… --fail
curl -o artifacts/manifests/build-parameters.sh https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tx1-llvm-release… --fail
curl -o artifacts/test.sh https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tx1-llvm-release… --fail
chmod +x artifacts/test.sh
# Reproduce the baseline build (build all pre-requisites)
./jenkins-scripts/tcwg_bmk-build.sh @@ artifacts/manifests/build-baseline.sh
cd llvm
# Reproduce first_bad build
git checkout --detach 4b1120159274ca98b4a58064b116aba88372ac98
../artifacts/test.sh
# Reproduce last_good build
git checkout --detach cb9d0e8819ad7ca2f349a57d62ea2af02d631dfa
../artifacts/test.sh
cd ..
</cut>
History of pending regressions and results: https://git.linaro.org/toolchain/ci/base-artifacts.git/log/?h=linaro-local/…
Artifacts: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tx1-llvm-release…
Build log: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tx1-llvm-release…
Full commit (up to 1000 lines):
<cut>
commit 4b1120159274ca98b4a58064b116aba88372ac98
Author: Michael Liao <michael.hliao(a)gmail.com>
Date: Mon Oct 12 10:01:40 2020 -0400
[MachineInstr] Add support for instructions with multiple memory operands.
- Basically iterate each pair of memory operands from both instructions
and return true if any of them may alias.
- The exception are memory instructions without any memory operand. They
may touch everything and could alias to any memory instruction.
Differential Revision: https://reviews.llvm.org/D89447
---
llvm/include/llvm/CodeGen/TargetInstrInfo.h | 15 +++
llvm/lib/CodeGen/MachineInstr.cpp | 145 ++++++++++++---------
.../test/CodeGen/AArch64/merge-store-dependency.ll | 4 +-
.../CodeGen/ARM/big-endian-neon-fp16-bitconv.ll | 4 +-
llvm/test/CodeGen/Thumb2/mve-float32regloops.ll | 8 +-
llvm/test/CodeGen/Thumb2/mve-phireg.ll | 10 +-
llvm/test/CodeGen/Thumb2/mve-vst3.ll | 2 +-
.../Thumb2/umulo-128-legalisation-lowering.ll | 8 +-
llvm/test/CodeGen/X86/store_op_load_fold2.ll | 11 +-
9 files changed, 118 insertions(+), 89 deletions(-)
diff --git a/llvm/include/llvm/CodeGen/TargetInstrInfo.h b/llvm/include/llvm/CodeGen/TargetInstrInfo.h
index 5d5a6efab220..68fc129cc0ed 100644
--- a/llvm/include/llvm/CodeGen/TargetInstrInfo.h
+++ b/llvm/include/llvm/CodeGen/TargetInstrInfo.h
@@ -1737,6 +1737,21 @@ public:
return 5;
}
+ /// Return the maximal number of alias checks on memory operands. For
+ /// instructions with more than one memory operands, the alias check on a
+ /// single MachineInstr pair has quadratic overhead and results in
+ /// unacceptable performance in the worst case. The limit here is to clamp
+ /// that maximal checks performed. Usually, that's the product of memory
+ /// operand numbers from that pair of MachineInstr to be checked. For
+ /// instance, with two MachineInstrs with 4 and 5 memory operands
+ /// correspondingly, a total of 20 checks are required. With this limit set to
+ /// 16, their alias check is skipped. We choose to limit the product instead
+ /// of the individual instruction as targets may have special MachineInstrs
+ /// with a considerably high number of memory operands, such as `ldm` in ARM.
+ /// Setting this limit per MachineInstr would result in either too high
+ /// overhead or too rigid restriction.
+ virtual unsigned getMemOperandAACheckLimit() const { return 16; }
+
/// Return an array that contains the ids of the target indices (used for the
/// TargetIndex machine operand) and their names.
///
diff --git a/llvm/lib/CodeGen/MachineInstr.cpp b/llvm/lib/CodeGen/MachineInstr.cpp
index d45c53b81816..fd658cdb41b9 100644
--- a/llvm/lib/CodeGen/MachineInstr.cpp
+++ b/llvm/lib/CodeGen/MachineInstr.cpp
@@ -1276,81 +1276,96 @@ bool MachineInstr::mayAlias(AAResults *AA, const MachineInstr &Other,
if (TII->areMemAccessesTriviallyDisjoint(*this, Other))
return false;
- // FIXME: Need to handle multiple memory operands to support all targets.
- if (!hasOneMemOperand() || !Other.hasOneMemOperand())
+ // Memory operations without memory operands may access anything. Be
+ // conservative and assume `MayAlias`.
+ if (memoperands_empty() || Other.memoperands_empty())
return true;
- MachineMemOperand *MMOa = *memoperands_begin();
- MachineMemOperand *MMOb = *Other.memoperands_begin();
-
- // The following interface to AA is fashioned after DAGCombiner::isAlias
- // and operates with MachineMemOperand offset with some important
- // assumptions:
- // - LLVM fundamentally assumes flat address spaces.
- // - MachineOperand offset can *only* result from legalization and
- // cannot affect queries other than the trivial case of overlap
- // checking.
- // - These offsets never wrap and never step outside
- // of allocated objects.
- // - There should never be any negative offsets here.
- //
- // FIXME: Modify API to hide this math from "user"
- // Even before we go to AA we can reason locally about some
- // memory objects. It can save compile time, and possibly catch some
- // corner cases not currently covered.
-
- int64_t OffsetA = MMOa->getOffset();
- int64_t OffsetB = MMOb->getOffset();
- int64_t MinOffset = std::min(OffsetA, OffsetB);
-
- uint64_t WidthA = MMOa->getSize();
- uint64_t WidthB = MMOb->getSize();
- bool KnownWidthA = WidthA != MemoryLocation::UnknownSize;
- bool KnownWidthB = WidthB != MemoryLocation::UnknownSize;
-
- const Value *ValA = MMOa->getValue();
- const Value *ValB = MMOb->getValue();
- bool SameVal = (ValA && ValB && (ValA == ValB));
- if (!SameVal) {
- const PseudoSourceValue *PSVa = MMOa->getPseudoValue();
- const PseudoSourceValue *PSVb = MMOb->getPseudoValue();
- if (PSVa && ValB && !PSVa->mayAlias(&MFI))
- return false;
- if (PSVb && ValA && !PSVb->mayAlias(&MFI))
- return false;
- if (PSVa && PSVb && (PSVa == PSVb))
- SameVal = true;
- }
+ // Skip if there are too many memory operands.
+ auto NumChecks = getNumMemOperands() * Other.getNumMemOperands();
+ if (NumChecks > TII->getMemOperandAACheckLimit())
+ return true;
+
+ auto HasAlias = [MFI, AA, UseTBAA](const MachineMemOperand *MMOa,
+ const MachineMemOperand *MMOb) {
+ // The following interface to AA is fashioned after DAGCombiner::isAlias
+ // and operates with MachineMemOperand offset with some important
+ // assumptions:
+ // - LLVM fundamentally assumes flat address spaces.
+ // - MachineOperand offset can *only* result from legalization and
+ // cannot affect queries other than the trivial case of overlap
+ // checking.
+ // - These offsets never wrap and never step outside
+ // of allocated objects.
+ // - There should never be any negative offsets here.
+ //
+ // FIXME: Modify API to hide this math from "user"
+ // Even before we go to AA we can reason locally about some
+ // memory objects. It can save compile time, and possibly catch some
+ // corner cases not currently covered.
+
+ int64_t OffsetA = MMOa->getOffset();
+ int64_t OffsetB = MMOb->getOffset();
+ int64_t MinOffset = std::min(OffsetA, OffsetB);
+
+ uint64_t WidthA = MMOa->getSize();
+ uint64_t WidthB = MMOb->getSize();
+ bool KnownWidthA = WidthA != MemoryLocation::UnknownSize;
+ bool KnownWidthB = WidthB != MemoryLocation::UnknownSize;
+
+ const Value *ValA = MMOa->getValue();
+ const Value *ValB = MMOb->getValue();
+ bool SameVal = (ValA && ValB && (ValA == ValB));
+ if (!SameVal) {
+ const PseudoSourceValue *PSVa = MMOa->getPseudoValue();
+ const PseudoSourceValue *PSVb = MMOb->getPseudoValue();
+ if (PSVa && ValB && !PSVa->mayAlias(&MFI))
+ return false;
+ if (PSVb && ValA && !PSVb->mayAlias(&MFI))
+ return false;
+ if (PSVa && PSVb && (PSVa == PSVb))
+ SameVal = true;
+ }
+
+ if (SameVal) {
+ if (!KnownWidthA || !KnownWidthB)
+ return true;
+ int64_t MaxOffset = std::max(OffsetA, OffsetB);
+ int64_t LowWidth = (MinOffset == OffsetA) ? WidthA : WidthB;
+ return (MinOffset + LowWidth > MaxOffset);
+ }
- if (SameVal) {
- if (!KnownWidthA || !KnownWidthB)
+ if (!AA)
return true;
- int64_t MaxOffset = std::max(OffsetA, OffsetB);
- int64_t LowWidth = (MinOffset == OffsetA) ? WidthA : WidthB;
- return (MinOffset + LowWidth > MaxOffset);
- }
- if (!AA)
- return true;
+ if (!ValA || !ValB)
+ return true;
- if (!ValA || !ValB)
- return true;
+ assert((OffsetA >= 0) && "Negative MachineMemOperand offset");
+ assert((OffsetB >= 0) && "Negative MachineMemOperand offset");
- assert((OffsetA >= 0) && "Negative MachineMemOperand offset");
- assert((OffsetB >= 0) && "Negative MachineMemOperand offset");
+ int64_t OverlapA = KnownWidthA ? WidthA + OffsetA - MinOffset
+ : MemoryLocation::UnknownSize;
+ int64_t OverlapB = KnownWidthB ? WidthB + OffsetB - MinOffset
+ : MemoryLocation::UnknownSize;
- int64_t OverlapA = KnownWidthA ? WidthA + OffsetA - MinOffset
- : MemoryLocation::UnknownSize;
- int64_t OverlapB = KnownWidthB ? WidthB + OffsetB - MinOffset
- : MemoryLocation::UnknownSize;
+ AliasResult AAResult =
+ AA->alias(MemoryLocation(ValA, OverlapA,
+ UseTBAA ? MMOa->getAAInfo() : AAMDNodes()),
+ MemoryLocation(ValB, OverlapB,
+ UseTBAA ? MMOb->getAAInfo() : AAMDNodes()));
- AliasResult AAResult = AA->alias(
- MemoryLocation(ValA, OverlapA,
- UseTBAA ? MMOa->getAAInfo() : AAMDNodes()),
- MemoryLocation(ValB, OverlapB,
- UseTBAA ? MMOb->getAAInfo() : AAMDNodes()));
+ return (AAResult != NoAlias);
+ };
- return (AAResult != NoAlias);
+ // Check each pair of memory operands from both instructions, which can't
+ // alias only if all pairs won't alias.
+ for (auto *MMOa : memoperands())
+ for (auto *MMOb : Other.memoperands())
+ if (HasAlias(MMOa, MMOb))
+ return true;
+
+ return false;
}
/// hasOrderedMemoryRef - Return true if this instruction may have an ordered
diff --git a/llvm/test/CodeGen/AArch64/merge-store-dependency.ll b/llvm/test/CodeGen/AArch64/merge-store-dependency.ll
index 6850846fec06..3a768d0e3f9b 100644
--- a/llvm/test/CodeGen/AArch64/merge-store-dependency.ll
+++ b/llvm/test/CodeGen/AArch64/merge-store-dependency.ll
@@ -19,11 +19,11 @@ define void @test(%struct1* %fde, i32 %fd, void (i32, i32, i8*)* %func, i8* %arg
; A53-NEXT: mov x19, x8
; A53-NEXT: mov w0, w1
; A53-NEXT: mov w9, #256
+; A53-NEXT: stp x2, x3, [x8, #32]
+; A53-NEXT: mov x2, x8
; A53-NEXT: str q0, [x19, #16]!
; A53-NEXT: str w1, [x19]
; A53-NEXT: mov w1, #4
-; A53-NEXT: stp x2, x3, [x8, #32]
-; A53-NEXT: mov x2, x8
; A53-NEXT: str q0, [x8]
; A53-NEXT: strh w9, [x8, #24]
; A53-NEXT: str wzr, [x8, #20]
diff --git a/llvm/test/CodeGen/ARM/big-endian-neon-fp16-bitconv.ll b/llvm/test/CodeGen/ARM/big-endian-neon-fp16-bitconv.ll
index 9942d6df99a4..693f33553591 100644
--- a/llvm/test/CodeGen/ARM/big-endian-neon-fp16-bitconv.ll
+++ b/llvm/test/CodeGen/ARM/big-endian-neon-fp16-bitconv.ll
@@ -503,12 +503,12 @@ define void @conv_v8f16_to_i128( <8 x half> %a, i128* %store ) {
; CHECK-NEXT: vmov.32 r3, d16[1]
; CHECK-NEXT: vmov.32 r1, d16[0]
; CHECK-NEXT: subs r12, r12, #1
+; CHECK-NEXT: str r12, [r0, #12]
; CHECK-NEXT: sbcs r2, r2, #0
+; CHECK-NEXT: str r2, [r0, #8]
; CHECK-NEXT: sbcs r3, r3, #0
; CHECK-NEXT: sbc r1, r1, #0
; CHECK-NEXT: stm r0, {r1, r3}
-; CHECK-NEXT: str r2, [r0, #8]
-; CHECK-NEXT: str r12, [r0, #12]
; CHECK-NEXT: bx lr
; CHECK-NEXT: .p2align 4
; CHECK-NEXT: @ %bb.1:
diff --git a/llvm/test/CodeGen/Thumb2/mve-float32regloops.ll b/llvm/test/CodeGen/Thumb2/mve-float32regloops.ll
index a43f564951e9..4fe8877aa8bd 100644
--- a/llvm/test/CodeGen/Thumb2/mve-float32regloops.ll
+++ b/llvm/test/CodeGen/Thumb2/mve-float32regloops.ll
@@ -1094,6 +1094,7 @@ define void @fir(%struct.arm_fir_instance_f32* nocapture readonly %S, float* noc
; CHECK-NEXT: ldrd r11, r8, [r12, #24]
; CHECK-NEXT: vstrb.8 q0, [r9], #16
; CHECK-NEXT: vldrw.u32 q0, [r5], #32
+; CHECK-NEXT: strd r9, r1, [sp, #24] @ 8-byte Folded Spill
; CHECK-NEXT: vldrw.u32 q1, [r5, #-28]
; CHECK-NEXT: vmul.f32 q0, q0, r7
; CHECK-NEXT: vldrw.u32 q6, [r5, #-24]
@@ -1105,13 +1106,12 @@ define void @fir(%struct.arm_fir_instance_f32* nocapture readonly %S, float* noc
; CHECK-NEXT: vfma.f32 q0, q4, r6
; CHECK-NEXT: vldrw.u32 q3, [r5, #-8]
; CHECK-NEXT: vfma.f32 q0, q5, r3
-; CHECK-NEXT: vldrw.u32 q1, [r5, #-4]
-; CHECK-NEXT: vfma.f32 q0, q2, lr
; CHECK-NEXT: ldr r0, [sp, #20] @ 4-byte Reload
+; CHECK-NEXT: vfma.f32 q0, q2, lr
+; CHECK-NEXT: vldrw.u32 q1, [r5, #-4]
; CHECK-NEXT: vfma.f32 q0, q3, r11
-; CHECK-NEXT: strd r9, r1, [sp, #24] @ 8-byte Folded Spill
-; CHECK-NEXT: vfma.f32 q0, q1, r8
; CHECK-NEXT: cmp r0, #16
+; CHECK-NEXT: vfma.f32 q0, q1, r8
; CHECK-NEXT: blo .LBB16_7
; CHECK-NEXT: @ %bb.5: @ %for.body.preheader
; CHECK-NEXT: @ in Loop: Header=BB16_4 Depth=1
diff --git a/llvm/test/CodeGen/Thumb2/mve-phireg.ll b/llvm/test/CodeGen/Thumb2/mve-phireg.ll
index e7d6a7323bc1..0fe26fbc4753 100644
--- a/llvm/test/CodeGen/Thumb2/mve-phireg.ll
+++ b/llvm/test/CodeGen/Thumb2/mve-phireg.ll
@@ -168,16 +168,14 @@ define dso_local i32 @e() #0 {
; CHECK-NEXT: vmov q1, q4
; CHECK-NEXT: vmov s1, r7
; CHECK-NEXT: vmov.32 q1[1], r6
-; CHECK-NEXT: mov.w r10, #0
-; CHECK-NEXT: vmov.32 q1[2], r5
; CHECK-NEXT: vmov.32 q5[0], r7
+; CHECK-NEXT: vmov.32 q1[2], r5
+; CHECK-NEXT: vmov s9, r4
; CHECK-NEXT: vmov.32 q1[3], r4
-; CHECK-NEXT: strd r0, r10, [sp, #24]
+; CHECK-NEXT: vdup.32 q6, r7
; CHECK-NEXT: vstrw.32 q1, [sp, #76]
; CHECK-NEXT: vmov q1, q5
-; CHECK-NEXT: vmov s9, r4
; CHECK-NEXT: vmov.32 q1[1], r7
-; CHECK-NEXT: vdup.32 q6, r7
; CHECK-NEXT: vmov.f32 s2, s1
; CHECK-NEXT: vmov.f32 s8, s0
; CHECK-NEXT: vmov.32 q1[2], r6
@@ -185,6 +183,7 @@ define dso_local i32 @e() #0 {
; CHECK-NEXT: vmov q7, q6
; CHECK-NEXT: vmov.f32 s10, s1
; CHECK-NEXT: mov.w r8, #4
+; CHECK-NEXT: mov.w r10, #0
; CHECK-NEXT: vmov.32 q1[3], r4
; CHECK-NEXT: vmov.32 q3[0], r4
; CHECK-NEXT: vmov.32 q7[1], r4
@@ -192,6 +191,7 @@ define dso_local i32 @e() #0 {
; CHECK-NEXT: vmov.f32 s11, s3
; CHECK-NEXT: movs r1, #64
; CHECK-NEXT: strh.w r8, [sp, #390]
+; CHECK-NEXT: strd r0, r10, [sp, #24]
; CHECK-NEXT: vstrw.32 q0, [sp, #44]
; CHECK-NEXT: str r0, [r0]
; CHECK-NEXT: vstrw.32 q2, [r0]
diff --git a/llvm/test/CodeGen/Thumb2/mve-vst3.ll b/llvm/test/CodeGen/Thumb2/mve-vst3.ll
index 600c5279ca91..1ae74c1738c7 100644
--- a/llvm/test/CodeGen/Thumb2/mve-vst3.ll
+++ b/llvm/test/CodeGen/Thumb2/mve-vst3.ll
@@ -24,8 +24,8 @@ define void @vst3_v2i32(<2 x i32> *%src, <6 x i32> *%dst) {
; CHECK-NEXT: vmov.f32 s9, s6
; CHECK-NEXT: vmov.f32 s10, s0
; CHECK-NEXT: vmov.f32 s11, s5
-; CHECK-NEXT: strd r2, r0, [r1, #16]
; CHECK-NEXT: vstrw.32 q2, [r1]
+; CHECK-NEXT: strd r2, r0, [r1, #16]
; CHECK-NEXT: pop {r4, pc}
entry:
%s1 = getelementptr <2 x i32>, <2 x i32>* %src, i32 0
diff --git a/llvm/test/CodeGen/Thumb2/umulo-128-legalisation-lowering.ll b/llvm/test/CodeGen/Thumb2/umulo-128-legalisation-lowering.ll
index ac1c814b838e..f57c9226179b 100644
--- a/llvm/test/CodeGen/Thumb2/umulo-128-legalisation-lowering.ll
+++ b/llvm/test/CodeGen/Thumb2/umulo-128-legalisation-lowering.ll
@@ -8,17 +8,17 @@ define { i128, i8 } @muloti_test(i128 %l, i128 %r) unnamed_addr #0 {
; THUMBV7-NEXT: push.w {r4, r5, r6, r7, r8, r9, r10, r11, lr}
; THUMBV7-NEXT: .pad #44
; THUMBV7-NEXT: sub sp, #44
-; THUMBV7-NEXT: ldrd r4, r7, [sp, #88]
-; THUMBV7-NEXT: mov r5, r3
; THUMBV7-NEXT: str r0, [sp, #40] @ 4-byte Spill
; THUMBV7-NEXT: movs r0, #0
-; THUMBV7-NEXT: strd r4, r7, [sp]
-; THUMBV7-NEXT: mov r1, r3
+; THUMBV7-NEXT: ldrd r4, r7, [sp, #88]
+; THUMBV7-NEXT: mov r5, r3
; THUMBV7-NEXT: strd r0, r0, [sp, #8]
+; THUMBV7-NEXT: mov r1, r3
; THUMBV7-NEXT: mov r6, r2
; THUMBV7-NEXT: mov r0, r2
; THUMBV7-NEXT: movs r2, #0
; THUMBV7-NEXT: movs r3, #0
+; THUMBV7-NEXT: strd r4, r7, [sp]
; THUMBV7-NEXT: bl __multi3
; THUMBV7-NEXT: strd r1, r0, [sp, #32] @ 8-byte Folded Spill
; THUMBV7-NEXT: strd r3, r2, [sp, #24] @ 8-byte Folded Spill
diff --git a/llvm/test/CodeGen/X86/store_op_load_fold2.ll b/llvm/test/CodeGen/X86/store_op_load_fold2.ll
index 674b8d8f9384..6f088772436e 100644
--- a/llvm/test/CodeGen/X86/store_op_load_fold2.ll
+++ b/llvm/test/CodeGen/X86/store_op_load_fold2.ll
@@ -17,13 +17,12 @@ cond_true2732.preheader: ; preds = %entry
store i64 %tmp2676.us.us, i64* %tmp2666
ret i32 0
-; INTEL: and {{e..}}, dword ptr [356]
-; INTEL: and dword ptr [360], {{e..}}
-; FIXME: mov dword ptr [356], {{e..}}
-; The above line comes out as 'mov 360, eax', but when the register is ecx it works?
+; INTEL-DAG: and {{e..}}, dword ptr [356]
+; INTEL-DAG: and dword ptr [360], {{e..}}
+; INTEL: mov dword ptr [356], {{e..}}
-; ATT: andl 356, %{{e..}}
-; ATT: andl %{{e..}}, 360
+; ATT-DAG: andl 356, %{{e..}}
+; ATT-DAG: andl %{{e..}}, 360
; ATT: movl %{{e..}}, 356
}
</cut>
3 years, 10 months
- 1
- 0
[CI-NOTIFY]: TCWG Bisect tcwg_bmk_tk1/llvm-release-arm-spec2k6-Oz - Build # 9 - Successful!
by ci_notify＠linaro.org
Successfully identified regression in *llvm* in CI configuration tcwg_bmk_llvm_tk1/llvm-release-arm-spec2k6-Oz. So far, this commit has regressed CI configurations:
- tcwg_bmk_llvm_tk1/llvm-release-arm-spec2k6-Oz
Culprit:
<cut>
commit b4916918e5219ac25a5b6472c5638450f867d975
Author: Roman Lebedev <lebedev.ri(a)gmail.com>
Date: Fri Oct 30 09:12:49 2020 +0300
[SCEV] SCEVPtrToIntExpr simplifications
If we've got an SCEVPtrToIntExpr(op), where op is not an SCEVUnknown,
we want to sink the SCEVPtrToIntExpr into an operand,
so that the operation is performed on integers,
and eventually we end up with just an `SCEVPtrToIntExpr(SCEVUnknown)`.
Reviewed By: mkazantsev
Differential Revision: https://reviews.llvm.org/D89692
</cut>
Results regressed to (for first_bad == b4916918e5219ac25a5b6472c5638450f867d975)
# reset_artifacts:
-10
# build_abe binutils:
-9
# build_abe stage1 -- --set gcc_override_configure=--with-mode=thumb --set gcc_override_configure=--disable-libsanitizer:
-8
# build_abe linux:
-7
# build_abe glibc:
-6
# build_abe stage2 -- --set gcc_override_configure=--with-mode=thumb --set gcc_override_configure=--disable-libsanitizer:
-5
# build_llvm true:
-3
# true:
0
# benchmark -Oz_mthumb -- artifacts/build-b4916918e5219ac25a5b6472c5638450f867d975/results_id:
1
# 483.xalancbmk,[.] _ZSt9__find_ifIN9__gnu_cxx17__normal_iterat regressed by 111
from (for last_good == 81fc53a36a4e3ca5cc9d5bc9b3ea32f304e35b93)
# reset_artifacts:
-10
# build_abe binutils:
-9
# build_abe stage1 -- --set gcc_override_configure=--with-mode=thumb --set gcc_override_configure=--disable-libsanitizer:
-8
# build_abe linux:
-7
# build_abe glibc:
-6
# build_abe stage2 -- --set gcc_override_configure=--with-mode=thumb --set gcc_override_configure=--disable-libsanitizer:
-5
# build_llvm true:
-3
# true:
0
# benchmark -Oz_mthumb -- artifacts/build-81fc53a36a4e3ca5cc9d5bc9b3ea32f304e35b93/results_id:
1
Artifacts of last_good build: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tk1-llvm-release…
Results ID of last_good: tk1_32/tcwg_bmk_llvm_tk1/bisect-llvm-release-arm-spec2k6-Oz/749
Artifacts of first_bad build: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tk1-llvm-release…
Results ID of first_bad: tk1_32/tcwg_bmk_llvm_tk1/bisect-llvm-release-arm-spec2k6-Oz/752
Build top page/logs: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tk1-llvm-release…
Configuration details:
Reproduce builds:
<cut>
mkdir investigate-llvm-b4916918e5219ac25a5b6472c5638450f867d975
cd investigate-llvm-b4916918e5219ac25a5b6472c5638450f867d975
git clone https://git.linaro.org/toolchain/jenkins-scripts
mkdir -p artifacts/manifests
curl -o artifacts/manifests/build-baseline.sh https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tk1-llvm-release… --fail
curl -o artifacts/manifests/build-parameters.sh https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tk1-llvm-release… --fail
curl -o artifacts/test.sh https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tk1-llvm-release… --fail
chmod +x artifacts/test.sh
# Reproduce the baseline build (build all pre-requisites)
./jenkins-scripts/tcwg_bmk-build.sh @@ artifacts/manifests/build-baseline.sh
cd llvm
# Reproduce first_bad build
git checkout --detach b4916918e5219ac25a5b6472c5638450f867d975
../artifacts/test.sh
# Reproduce last_good build
git checkout --detach 81fc53a36a4e3ca5cc9d5bc9b3ea32f304e35b93
../artifacts/test.sh
cd ..
</cut>
History of pending regressions and results: https://git.linaro.org/toolchain/ci/base-artifacts.git/log/?h=linaro-local/…
Artifacts: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tk1-llvm-release…
Build log: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tk1-llvm-release…
Full commit (up to 1000 lines):
<cut>
commit b4916918e5219ac25a5b6472c5638450f867d975
Author: Roman Lebedev <lebedev.ri(a)gmail.com>
Date: Fri Oct 30 09:12:49 2020 +0300
[SCEV] SCEVPtrToIntExpr simplifications
If we've got an SCEVPtrToIntExpr(op), where op is not an SCEVUnknown,
we want to sink the SCEVPtrToIntExpr into an operand,
so that the operation is performed on integers,
and eventually we end up with just an `SCEVPtrToIntExpr(SCEVUnknown)`.
Reviewed By: mkazantsev
Differential Revision: https://reviews.llvm.org/D89692
---
llvm/lib/Analysis/ScalarEvolution.cpp | 56 +++++++++++++++++++---
llvm/test/Analysis/ScalarEvolution/ptrtoint.ll | 52 ++++++++++----------
.../LoopStrengthReduce/X86/expander-crashes.ll | 54 ++++++++++-----------
polly/test/ScopInfo/int2ptr_ptr2int.ll | 16 +++----
polly/test/ScopInfo/int2ptr_ptr2int_2.ll | 17 ++++---
5 files changed, 118 insertions(+), 77 deletions(-)
diff --git a/llvm/lib/Analysis/ScalarEvolution.cpp b/llvm/lib/Analysis/ScalarEvolution.cpp
index 11b99553bf6b..91f3b947fc50 100644
--- a/llvm/lib/Analysis/ScalarEvolution.cpp
+++ b/llvm/lib/Analysis/ScalarEvolution.cpp
@@ -1047,17 +1047,61 @@ const SCEV *ScalarEvolution::getPtrToIntExpr(const SCEV *Op, Type *Ty,
ID.AddPointer(Op);
void *IP = nullptr;
if (const SCEV *S = UniqueSCEVs.FindNodeOrInsertPos(ID, IP))
- return getTruncateOrZeroExtend(S, Ty);
+ return getTruncateOrZeroExtend(S, Ty, Depth);
- assert(!isa<SCEVConstant>(Op) &&
- "SCEVConstant is an integer, no constant folding to do.");
+ assert((isa<SCEVNAryExpr>(Op) || isa<SCEVUnknown>(Op)) &&
+ "We can only gen an nary expression, or an unknown here.");
- // FIXME: simplifications.
+ Type *IntPtrTy = getDataLayout().getIntPtrType(Op->getType());
+
+ // If the input operand is not an unknown (and thus is an nary expression),
+ // sink the cast to operands, so that the operation is performed on integers,
+ // and we eventually end up with just an ptrtoint(unknown).
+ if (const SCEVNAryExpr *NaryExpr = dyn_cast<SCEVNAryExpr>(Op)) {
+ SmallVector<const SCEV *, 2> NewOps;
+ NewOps.reserve(NaryExpr->getNumOperands());
+ for (const SCEV *Op : NaryExpr->operands())
+ NewOps.push_back(Op->getType()->isPointerTy()
+ ? getPtrToIntExpr(Op, IntPtrTy, Depth + 1)
+ : Op);
+ const SCEV *NewNaryExpr = nullptr;
+ switch (SCEVTypes SCEVType = NaryExpr->getSCEVType()) {
+ case scAddExpr:
+ NewNaryExpr = getAddExpr(NewOps, NaryExpr->getNoWrapFlags(), Depth + 1);
+ break;
+ case scAddRecExpr:
+ NewNaryExpr =
+ getAddRecExpr(NewOps, cast<SCEVAddRecExpr>(NaryExpr)->getLoop(),
+ NaryExpr->getNoWrapFlags());
+ break;
+ case scUMaxExpr:
+ case scSMaxExpr:
+ case scUMinExpr:
+ case scSMinExpr:
+ NewNaryExpr = getMinMaxExpr(SCEVType, NewOps);
+ break;
+
+ case scMulExpr:
+ NewNaryExpr = getMulExpr(NewOps, NaryExpr->getNoWrapFlags(), Depth + 1);
+ break;
+ case scUDivExpr:
+ NewNaryExpr = getUDivExpr(NewOps[0], NewOps[1]);
+ break;
+ case scConstant:
+ case scTruncate:
+ case scZeroExtend:
+ case scSignExtend:
+ case scPtrToInt:
+ case scUnknown:
+ case scCouldNotCompute:
+ llvm_unreachable("We can't get these types here.");
+ }
+ return getTruncateOrZeroExtend(NewNaryExpr, Ty, Depth);
+ }
// The cast wasn't folded; create an explicit cast node. We can reuse
// the existing insert position since if we get here, we won't have
// made any changes which would invalidate it.
- Type *IntPtrTy = getDataLayout().getIntPtrType(Op->getType());
assert(getDataLayout().getTypeSizeInBits(getEffectiveSCEVType(
Op->getType())) == getDataLayout().getTypeSizeInBits(IntPtrTy) &&
"We can only model ptrtoint if SCEV's effective (integer) type is "
@@ -1066,7 +1110,7 @@ const SCEV *ScalarEvolution::getPtrToIntExpr(const SCEV *Op, Type *Ty,
SCEVPtrToIntExpr(ID.Intern(SCEVAllocator), Op, IntPtrTy);
UniqueSCEVs.InsertNode(S, IP);
addToLoopUseLists(S);
- return getTruncateOrZeroExtend(S, Ty);
+ return getTruncateOrZeroExtend(S, Ty, Depth);
}
const SCEV *ScalarEvolution::getTruncateExpr(const SCEV *Op, Type *Ty,
diff --git a/llvm/test/Analysis/ScalarEvolution/ptrtoint.ll b/llvm/test/Analysis/ScalarEvolution/ptrtoint.ll
index 9a6c77e8968e..70fb37984d8a 100644
--- a/llvm/test/Analysis/ScalarEvolution/ptrtoint.ll
+++ b/llvm/test/Analysis/ScalarEvolution/ptrtoint.ll
@@ -196,7 +196,7 @@ define void @ptrtoint_of_gep(i8* %in, i64* %out0) {
; X64-NEXT: %in_adj = getelementptr inbounds i8, i8* %in, i64 42
; X64-NEXT: --> (42 + %in)<nsw> U: [-9223372036854775766,-9223372036854775808) S: [-9223372036854775766,-9223372036854775808)
; X64-NEXT: %p0 = ptrtoint i8* %in_adj to i64
-; X64-NEXT: --> (ptrtoint i8* (42 + %in)<nsw> to i64) U: [-9223372036854775766,-9223372036854775808) S: [-9223372036854775766,-9223372036854775808)
+; X64-NEXT: --> (42 + (ptrtoint i8* %in to i64))<nsw> U: [-9223372036854775766,-9223372036854775808) S: [-9223372036854775766,-9223372036854775808)
; X64-NEXT: Determining loop execution counts for: @ptrtoint_of_gep
;
; X32-LABEL: 'ptrtoint_of_gep'
@@ -204,7 +204,7 @@ define void @ptrtoint_of_gep(i8* %in, i64* %out0) {
; X32-NEXT: %in_adj = getelementptr inbounds i8, i8* %in, i64 42
; X32-NEXT: --> (42 + %in)<nsw> U: [-2147483606,-2147483648) S: [-2147483606,-2147483648)
; X32-NEXT: %p0 = ptrtoint i8* %in_adj to i64
-; X32-NEXT: --> (zext i32 (ptrtoint i8* (42 + %in)<nsw> to i32) to i64) U: [0,4294967296) S: [0,4294967296)
+; X32-NEXT: --> (zext i32 (42 + (ptrtoint i8* %in to i32))<nsw> to i64) U: [0,4294967296) S: [0,4294967296)
; X32-NEXT: Determining loop execution counts for: @ptrtoint_of_gep
;
%in_adj = getelementptr inbounds i8, i8* %in, i64 42
@@ -226,7 +226,7 @@ define void @ptrtoint_of_addrec(i32* %in, i32 %count) {
; X64-NEXT: %i7 = getelementptr inbounds i32, i32* %in, i64 %i6
; X64-NEXT: --> {%in,+,4}<nsw><%loop> U: full-set S: full-set Exits: (-4 + (4 * (zext i32 %count to i64))<nuw><nsw> + %in) LoopDispositions: { %loop: Computable }
; X64-NEXT: %i8 = ptrtoint i32* %i7 to i64
-; X64-NEXT: --> (ptrtoint i32* {%in,+,4}<nsw><%loop> to i64) U: full-set S: full-set Exits: (ptrtoint i32* (-4 + (4 * (zext i32 %count to i64))<nuw><nsw> + %in) to i64) LoopDispositions: { %loop: Computable }
+; X64-NEXT: --> {(ptrtoint i32* %in to i64),+,4}<nsw><%loop> U: full-set S: full-set Exits: (-4 + (4 * (zext i32 %count to i64))<nuw><nsw> + (ptrtoint i32* %in to i64)) LoopDispositions: { %loop: Computable }
; X64-NEXT: %i9 = add nuw nsw i64 %i6, 1
; X64-NEXT: --> {1,+,1}<nuw><%loop> U: [1,0) S: [1,0) Exits: (zext i32 %count to i64) LoopDispositions: { %loop: Computable }
; X64-NEXT: Determining loop execution counts for: @ptrtoint_of_addrec
@@ -245,7 +245,7 @@ define void @ptrtoint_of_addrec(i32* %in, i32 %count) {
; X32-NEXT: %i7 = getelementptr inbounds i32, i32* %in, i64 %i6
; X32-NEXT: --> {%in,+,4}<%loop> U: full-set S: full-set Exits: (-4 + (4 * %count) + %in) LoopDispositions: { %loop: Computable }
; X32-NEXT: %i8 = ptrtoint i32* %i7 to i64
-; X32-NEXT: --> (zext i32 (ptrtoint i32* {%in,+,4}<%loop> to i32) to i64) U: [0,4294967296) S: [0,4294967296) Exits: (zext i32 (ptrtoint i32* (-4 + (4 * %count) + %in) to i32) to i64) LoopDispositions: { %loop: Computable }
+; X32-NEXT: --> (zext i32 {(ptrtoint i32* %in to i32),+,4}<%loop> to i64) U: [0,4294967296) S: [0,4294967296) Exits: (zext i32 (-4 + (4 * %count) + (ptrtoint i32* %in to i32)) to i64) LoopDispositions: { %loop: Computable }
; X32-NEXT: %i9 = add nuw nsw i64 %i6, 1
; X32-NEXT: --> {1,+,1}<nuw><%loop> U: [1,0) S: [1,0) Exits: (zext i32 %count to i64) LoopDispositions: { %loop: Computable }
; X32-NEXT: Determining loop execution counts for: @ptrtoint_of_addrec
@@ -280,7 +280,7 @@ define void @ptrtoint_of_umax(i8* %in0, i8* %in1, i64* %out0) {
; X64-NEXT: %s = select i1 %c, i8* %in0, i8* %in1
; X64-NEXT: --> (%in0 umax %in1) U: full-set S: full-set
; X64-NEXT: %p0 = ptrtoint i8* %s to i64
-; X64-NEXT: --> (ptrtoint i8* (%in0 umax %in1) to i64) U: full-set S: full-set
+; X64-NEXT: --> ((ptrtoint i8* %in0 to i64) umax (ptrtoint i8* %in1 to i64)) U: full-set S: full-set
; X64-NEXT: Determining loop execution counts for: @ptrtoint_of_umax
;
; X32-LABEL: 'ptrtoint_of_umax'
@@ -288,7 +288,7 @@ define void @ptrtoint_of_umax(i8* %in0, i8* %in1, i64* %out0) {
; X32-NEXT: %s = select i1 %c, i8* %in0, i8* %in1
; X32-NEXT: --> (%in0 umax %in1) U: full-set S: full-set
; X32-NEXT: %p0 = ptrtoint i8* %s to i64
-; X32-NEXT: --> (zext i32 (ptrtoint i8* (%in0 umax %in1) to i32) to i64) U: [0,4294967296) S: [0,4294967296)
+; X32-NEXT: --> (zext i32 ((ptrtoint i8* %in0 to i32) umax (ptrtoint i8* %in1 to i32)) to i64) U: [0,4294967296) S: [0,4294967296)
; X32-NEXT: Determining loop execution counts for: @ptrtoint_of_umax
;
%c = icmp uge i8* %in0, %in1
@@ -304,7 +304,7 @@ define void @ptrtoint_of_smax(i8* %in0, i8* %in1, i64* %out0) {
; X64-NEXT: %s = select i1 %c, i8* %in0, i8* %in1
; X64-NEXT: --> (%in0 smax %in1) U: full-set S: full-set
; X64-NEXT: %p0 = ptrtoint i8* %s to i64
-; X64-NEXT: --> (ptrtoint i8* (%in0 smax %in1) to i64) U: full-set S: full-set
+; X64-NEXT: --> ((ptrtoint i8* %in0 to i64) smax (ptrtoint i8* %in1 to i64)) U: full-set S: full-set
; X64-NEXT: Determining loop execution counts for: @ptrtoint_of_smax
;
; X32-LABEL: 'ptrtoint_of_smax'
@@ -312,7 +312,7 @@ define void @ptrtoint_of_smax(i8* %in0, i8* %in1, i64* %out0) {
; X32-NEXT: %s = select i1 %c, i8* %in0, i8* %in1
; X32-NEXT: --> (%in0 smax %in1) U: full-set S: full-set
; X32-NEXT: %p0 = ptrtoint i8* %s to i64
-; X32-NEXT: --> (zext i32 (ptrtoint i8* (%in0 smax %in1) to i32) to i64) U: [0,4294967296) S: [0,4294967296)
+; X32-NEXT: --> (zext i32 ((ptrtoint i8* %in0 to i32) smax (ptrtoint i8* %in1 to i32)) to i64) U: [0,4294967296) S: [0,4294967296)
; X32-NEXT: Determining loop execution counts for: @ptrtoint_of_smax
;
%c = icmp sge i8* %in0, %in1
@@ -328,7 +328,7 @@ define void @ptrtoint_of_umin(i8* %in0, i8* %in1, i64* %out0) {
; X64-NEXT: %s = select i1 %c, i8* %in0, i8* %in1
; X64-NEXT: --> (%in0 umin %in1) U: full-set S: full-set
; X64-NEXT: %p0 = ptrtoint i8* %s to i64
-; X64-NEXT: --> (ptrtoint i8* (%in0 umin %in1) to i64) U: full-set S: full-set
+; X64-NEXT: --> ((ptrtoint i8* %in0 to i64) umin (ptrtoint i8* %in1 to i64)) U: full-set S: full-set
; X64-NEXT: Determining loop execution counts for: @ptrtoint_of_umin
;
; X32-LABEL: 'ptrtoint_of_umin'
@@ -336,7 +336,7 @@ define void @ptrtoint_of_umin(i8* %in0, i8* %in1, i64* %out0) {
; X32-NEXT: %s = select i1 %c, i8* %in0, i8* %in1
; X32-NEXT: --> (%in0 umin %in1) U: full-set S: full-set
; X32-NEXT: %p0 = ptrtoint i8* %s to i64
-; X32-NEXT: --> (zext i32 (ptrtoint i8* (%in0 umin %in1) to i32) to i64) U: [0,4294967296) S: [0,4294967296)
+; X32-NEXT: --> (zext i32 ((ptrtoint i8* %in0 to i32) umin (ptrtoint i8* %in1 to i32)) to i64) U: [0,4294967296) S: [0,4294967296)
; X32-NEXT: Determining loop execution counts for: @ptrtoint_of_umin
;
%c = icmp ule i8* %in0, %in1
@@ -352,7 +352,7 @@ define void @ptrtoint_of_smin(i8* %in0, i8* %in1, i64* %out0) {
; X64-NEXT: %s = select i1 %c, i8* %in0, i8* %in1
; X64-NEXT: --> (%in0 smin %in1) U: full-set S: full-set
; X64-NEXT: %p0 = ptrtoint i8* %s to i64
-; X64-NEXT: --> (ptrtoint i8* (%in0 smin %in1) to i64) U: full-set S: full-set
+; X64-NEXT: --> ((ptrtoint i8* %in0 to i64) smin (ptrtoint i8* %in1 to i64)) U: full-set S: full-set
; X64-NEXT: Determining loop execution counts for: @ptrtoint_of_smin
;
; X32-LABEL: 'ptrtoint_of_smin'
@@ -360,7 +360,7 @@ define void @ptrtoint_of_smin(i8* %in0, i8* %in1, i64* %out0) {
; X32-NEXT: %s = select i1 %c, i8* %in0, i8* %in1
; X32-NEXT: --> (%in0 smin %in1) U: full-set S: full-set
; X32-NEXT: %p0 = ptrtoint i8* %s to i64
-; X32-NEXT: --> (zext i32 (ptrtoint i8* (%in0 smin %in1) to i32) to i64) U: [0,4294967296) S: [0,4294967296)
+; X32-NEXT: --> (zext i32 ((ptrtoint i8* %in0 to i32) smin (ptrtoint i8* %in1 to i32)) to i64) U: [0,4294967296) S: [0,4294967296)
; X32-NEXT: Determining loop execution counts for: @ptrtoint_of_smin
;
%c = icmp sle i8* %in0, %in1
@@ -384,11 +384,11 @@ define void @pr46786_c26_char(i8* %arg, i8* %arg1, i8* %arg2) {
; X64-NEXT: %i8 = load i8, i8* %i7, align 1
; X64-NEXT: --> %i8 U: full-set S: full-set Exits: <<Unknown>> LoopDispositions: { %bb6: Variant }
; X64-NEXT: %i9 = ptrtoint i8* %i7 to i64
-; X64-NEXT: --> (ptrtoint i8* {%arg,+,1}<nuw><%bb6> to i64) U: full-set S: full-set Exits: (ptrtoint i8* (-1 + %arg1) to i64) LoopDispositions: { %bb6: Computable }
+; X64-NEXT: --> {(ptrtoint i8* %arg to i64),+,1}<nuw><%bb6> U: full-set S: full-set Exits: (-1 + (-1 * %arg) + (ptrtoint i8* %arg to i64) + %arg1) LoopDispositions: { %bb6: Computable }
; X64-NEXT: %i10 = sub i64 %i9, %i4
-; X64-NEXT: --> ((-1 * (ptrtoint i8* %arg to i64)) + (ptrtoint i8* {%arg,+,1}<nuw><%bb6> to i64)) U: full-set S: full-set Exits: ((-1 * (ptrtoint i8* %arg to i64)) + (ptrtoint i8* (-1 + %arg1) to i64)) LoopDispositions: { %bb6: Computable }
+; X64-NEXT: --> {0,+,1}<nw><%bb6> U: [0,-1) S: [0,-1) Exits: (-1 + (-1 * %arg) + %arg1) LoopDispositions: { %bb6: Computable }
; X64-NEXT: %i11 = getelementptr inbounds i8, i8* %arg2, i64 %i10
-; X64-NEXT: --> ((-1 * (ptrtoint i8* %arg to i64)) + (ptrtoint i8* {%arg,+,1}<nuw><%bb6> to i64) + %arg2) U: full-set S: full-set Exits: ((-1 * (ptrtoint i8* %arg to i64)) + (ptrtoint i8* (-1 + %arg1) to i64) + %arg2) LoopDispositions: { %bb6: Computable }
+; X64-NEXT: --> {%arg2,+,1}<nw><%bb6> U: full-set S: full-set Exits: (-1 + (-1 * %arg) + %arg1 + %arg2) LoopDispositions: { %bb6: Computable }
; X64-NEXT: %i12 = load i8, i8* %i11, align 1
; X64-NEXT: --> %i12 U: full-set S: full-set Exits: <<Unknown>> LoopDispositions: { %bb6: Variant }
; X64-NEXT: %i13 = add i8 %i12, %i8
@@ -411,11 +411,11 @@ define void @pr46786_c26_char(i8* %arg, i8* %arg1, i8* %arg2) {
; X32-NEXT: %i8 = load i8, i8* %i7, align 1
; X32-NEXT: --> %i8 U: full-set S: full-set Exits: <<Unknown>> LoopDispositions: { %bb6: Variant }
; X32-NEXT: %i9 = ptrtoint i8* %i7 to i64
-; X32-NEXT: --> (zext i32 (ptrtoint i8* {%arg,+,1}<nuw><%bb6> to i32) to i64) U: [0,4294967296) S: [0,4294967296) Exits: (zext i32 (ptrtoint i8* (-1 + %arg1) to i32) to i64) LoopDispositions: { %bb6: Computable }
+; X32-NEXT: --> {(zext i32 (ptrtoint i8* %arg to i32) to i64),+,1}<nuw><%bb6> U: [0,8589934590) S: [0,8589934590) Exits: ((zext i8* (-1 + (-1 * %arg) + %arg1) to i64) + (zext i32 (ptrtoint i8* %arg to i32) to i64)) LoopDispositions: { %bb6: Computable }
; X32-NEXT: %i10 = sub i64 %i9, %i4
-; X32-NEXT: --> ((zext i32 (ptrtoint i8* {%arg,+,1}<nuw><%bb6> to i32) to i64) + (-1 * (zext i32 (ptrtoint i8* %arg to i32) to i64))<nsw>) U: [-4294967295,4294967296) S: [-4294967295,4294967296) Exits: ((zext i32 (ptrtoint i8* (-1 + %arg1) to i32) to i64) + (-1 * (zext i32 (ptrtoint i8* %arg to i32) to i64))<nsw>) LoopDispositions: { %bb6: Computable }
+; X32-NEXT: --> {0,+,1}<nw><%bb6> U: [0,4294967295) S: [0,4294967295) Exits: (zext i8* (-1 + (-1 * %arg) + %arg1) to i64) LoopDispositions: { %bb6: Computable }
; X32-NEXT: %i11 = getelementptr inbounds i8, i8* %arg2, i64 %i10
-; X32-NEXT: --> ((-1 * (ptrtoint i8* %arg to i32)) + (ptrtoint i8* {%arg,+,1}<nuw><%bb6> to i32) + %arg2) U: full-set S: full-set Exits: ((-1 * (ptrtoint i8* %arg to i32)) + (ptrtoint i8* (-1 + %arg1) to i32) + %arg2) LoopDispositions: { %bb6: Computable }
+; X32-NEXT: --> {%arg2,+,1}<%bb6> U: full-set S: full-set Exits: (-1 + (-1 * %arg) + %arg1 + %arg2) LoopDispositions: { %bb6: Computable }
; X32-NEXT: %i12 = load i8, i8* %i11, align 1
; X32-NEXT: --> %i12 U: full-set S: full-set Exits: <<Unknown>> LoopDispositions: { %bb6: Variant }
; X32-NEXT: %i13 = add i8 %i12, %i8
@@ -469,13 +469,13 @@ define void @pr46786_c26_int(i32* %arg, i32* %arg1, i32* %arg2) {
; X64-NEXT: %i8 = load i32, i32* %i7, align 4
; X64-NEXT: --> %i8 U: full-set S: full-set Exits: <<Unknown>> LoopDispositions: { %bb6: Variant }
; X64-NEXT: %i9 = ptrtoint i32* %i7 to i64
-; X64-NEXT: --> (ptrtoint i32* {%arg,+,4}<nuw><%bb6> to i64) U: full-set S: full-set Exits: (ptrtoint i32* ((4 * ((-4 + (-1 * %arg) + %arg1) /u 4))<nuw> + %arg) to i64) LoopDispositions: { %bb6: Computable }
+; X64-NEXT: --> {(ptrtoint i32* %arg to i64),+,4}<nuw><%bb6> U: full-set S: full-set Exits: ((4 * ((-4 + (-1 * %arg) + %arg1) /u 4))<nuw> + (ptrtoint i32* %arg to i64)) LoopDispositions: { %bb6: Computable }
; X64-NEXT: %i10 = sub i64 %i9, %i4
-; X64-NEXT: --> ((-1 * (ptrtoint i32* %arg to i64)) + (ptrtoint i32* {%arg,+,4}<nuw><%bb6> to i64)) U: full-set S: full-set Exits: ((-1 * (ptrtoint i32* %arg to i64)) + (ptrtoint i32* ((4 * ((-4 + (-1 * %arg) + %arg1) /u 4))<nuw> + %arg) to i64)) LoopDispositions: { %bb6: Computable }
+; X64-NEXT: --> {0,+,4}<nw><%bb6> U: [0,-3) S: [-9223372036854775808,9223372036854775805) Exits: (4 * ((-4 + (-1 * %arg) + %arg1) /u 4))<nuw> LoopDispositions: { %bb6: Computable }
; X64-NEXT: %i11 = ashr exact i64 %i10, 2
-; X64-NEXT: --> (((((-1 * (ptrtoint i32* {%arg,+,4}<nuw><%bb6> to i64)) + (ptrtoint i32* %arg to i64)) smax ((-1 * (ptrtoint i32* %arg to i64)) + (ptrtoint i32* {%arg,+,4}<nuw><%bb6> to i64))) /u 4) * (1 smin (-1 smax ((-1 * (ptrtoint i32* %arg to i64)) + (ptrtoint i32* {%arg,+,4}<nuw><%bb6> to i64)))))<nsw> U: [-4611686018427387903,4611686018427387904) S: [-4611686018427387903,4611686018427387904) Exits: (((((-1 * (ptrtoint i32* ((4 * ((-4 + (-1 * %arg) + %arg1) /u 4))<nuw> + %arg) to i64)) + (ptrtoint i32* %arg to i64)) smax ((-1 * (ptrtoint i32* %arg to i64)) + (ptrtoint i32* ((4 * ((-4 + (-1 * %arg) + %arg1) /u 4))<nuw> + %arg) to i64))) /u 4) * (1 smin (-1 smax ((-1 * (ptrtoint i32* %arg to i64)) + (ptrtoint i32* ((4 * ((-4 + (-1 * %arg) + %arg1) /u 4))<nuw> + %arg) to i64)))))<nsw> LoopDispositions: { %bb6: Computable }
+; X64-NEXT: --> ((({0,+,4}<nw><%bb6> smax {0,+,-4}<nw><%bb6>) /u 4) * (1 smin (-1 smax {0,+,4}<nw><%bb6>)))<nsw> U: [-4611686018427387903,4611686018427387904) S: [-4611686018427387903,4611686018427387904) Exits: ((((4 * ((-4 + (-1 * %arg) + %arg1) /u 4))<nuw> smax (-4 * ((-4 + (-1 * %arg) + %arg1) /u 4))) /u 4) * (1 smin (-1 smax (4 * ((-4 + (-1 * %arg) + %arg1) /u 4))<nuw>)))<nsw> LoopDispositions: { %bb6: Computable }
; X64-NEXT: %i12 = getelementptr inbounds i32, i32* %arg2, i64 %i11
-; X64-NEXT: --> ((4 * ((((-1 * (ptrtoint i32* {%arg,+,4}<nuw><%bb6> to i64)) + (ptrtoint i32* %arg to i64)) smax ((-1 * (ptrtoint i32* %arg to i64)) + (ptrtoint i32* {%arg,+,4}<nuw><%bb6> to i64))) /u 4) * (1 smin (-1 smax ((-1 * (ptrtoint i32* %arg to i64)) + (ptrtoint i32* {%arg,+,4}<nuw><%bb6> to i64))))) + %arg2)<nsw> U: full-set S: full-set Exits: ((4 * ((((-1 * (ptrtoint i32* ((4 * ((-4 + (-1 * %arg) + %arg1) /u 4))<nuw> + %arg) to i64)) + (ptrtoint i32* %arg to i64)) smax ((-1 * (ptrtoint i32* %arg to i64)) + (ptrtoint i32* ((4 * ((-4 + (-1 * %arg) + %arg1) /u 4))<nuw> + %arg) to i64))) /u 4) * (1 smin (-1 smax ((-1 * (ptrtoint i32* %arg to i64)) + (ptrtoint i32* ((4 * ((-4 + (-1 * %arg) + %arg1) /u 4))<nuw> + %arg) to i64))))) + %arg2)<nsw> LoopDispositions: { %bb6: Computable }
+; X64-NEXT: --> ((4 * (({0,+,4}<nw><%bb6> smax {0,+,-4}<nw><%bb6>) /u 4) * (1 smin (-1 smax {0,+,4}<nw><%bb6>))) + %arg2)<nsw> U: full-set S: full-set Exits: ((4 * (((4 * ((-4 + (-1 * %arg) + %arg1) /u 4))<nuw> smax (-4 * ((-4 + (-1 * %arg) + %arg1) /u 4))) /u 4) * (1 smin (-1 smax (4 * ((-4 + (-1 * %arg) + %arg1) /u 4))<nuw>))) + %arg2)<nsw> LoopDispositions: { %bb6: Computable }
; X64-NEXT: %i13 = load i32, i32* %i12, align 4
; X64-NEXT: --> %i13 U: full-set S: full-set Exits: <<Unknown>> LoopDispositions: { %bb6: Variant }
; X64-NEXT: %i14 = add nsw i32 %i13, %i8
@@ -498,13 +498,13 @@ define void @pr46786_c26_int(i32* %arg, i32* %arg1, i32* %arg2) {
; X32-NEXT: %i8 = load i32, i32* %i7, align 4
; X32-NEXT: --> %i8 U: full-set S: full-set Exits: <<Unknown>> LoopDispositions: { %bb6: Variant }
; X32-NEXT: %i9 = ptrtoint i32* %i7 to i64
-; X32-NEXT: --> (zext i32 (ptrtoint i32* {%arg,+,4}<nuw><%bb6> to i32) to i64) U: [0,4294967296) S: [0,4294967296) Exits: (zext i32 (ptrtoint i32* ((4 * ((-4 + (-1 * %arg) + %arg1) /u 4))<nuw> + %arg) to i32) to i64) LoopDispositions: { %bb6: Computable }
+; X32-NEXT: --> {(zext i32 (ptrtoint i32* %arg to i32) to i64),+,4}<nuw><%bb6> U: [0,8589934588) S: [0,8589934588) Exits: ((zext i32 (ptrtoint i32* %arg to i32) to i64) + (4 * ((zext i32* (-4 + (-1 * %arg) + %arg1) to i64) /u 4))<nuw><nsw>) LoopDispositions: { %bb6: Computable }
; X32-NEXT: %i10 = sub i64 %i9, %i4
-; X32-NEXT: --> ((zext i32 (ptrtoint i32* {%arg,+,4}<nuw><%bb6> to i32) to i64) + (-1 * (zext i32 (ptrtoint i32* %arg to i32) to i64))<nsw>) U: [-4294967295,4294967296) S: [-4294967295,4294967296) Exits: ((zext i32 (ptrtoint i32* ((4 * ((-4 + (-1 * %arg) + %arg1) /u 4))<nuw> + %arg) to i32) to i64) + (-1 * (zext i32 (ptrtoint i32* %arg to i32) to i64))<nsw>) LoopDispositions: { %bb6: Computable }
+; X32-NEXT: --> {0,+,4}<nw><%bb6> U: [0,4294967293) S: [0,4294967293) Exits: (4 * ((zext i32* (-4 + (-1 * %arg) + %arg1) to i64) /u 4))<nuw><nsw> LoopDispositions: { %bb6: Computable }
; X32-NEXT: %i11 = ashr exact i64 %i10, 2
-; X32-NEXT: --> (((((zext i32 (ptrtoint i32* {%arg,+,4}<nuw><%bb6> to i32) to i64) + (-1 * (zext i32 (ptrtoint i32* %arg to i32) to i64))<nsw>) smax ((zext i32 (ptrtoint i32* %arg to i32) to i64) + (-1 * (zext i32 (ptrtoint i32* {%arg,+,4}<nuw><%bb6> to i32) to i64))<nsw>)) /u 4) * (1 smin (-1 smax ((zext i32 (ptrtoint i32* {%arg,+,4}<nuw><%bb6> to i32) to i64) + (-1 * (zext i32 (ptrtoint i32* %arg to i32) to i64))<nsw>))))<nsw> U: [-4611686018427387903,4611686018427387904) S: [-4611686018427387903,4611686018427387904) Exits: (((((zext i32 (ptrtoint i32* ((4 * ((-4 + (-1 * %arg) + %arg1) /u 4))<nuw> + %arg) to i32) to i64) + (-1 * (zext i32 (ptrtoint i32* %arg to i32) to i64))<nsw>) smax ((zext i32 (ptrtoint i32* %arg to i32) to i64) + (-1 * (zext i32 (ptrtoint i32* ((4 * ((-4 + (-1 * %arg) + %arg1) /u 4))<nuw> + %arg) to i32) to i64))<nsw>)) /u 4) * (1 smin (-1 smax ((zext i32 (ptrtoint i32* ((4 * ((-4 + (-1 * %arg) + %arg1) /u 4))<nuw> + %arg) to i32) to i64) + (-1 * (zext i32 (ptrtoint i32* %arg to i32) to i64))<nsw>))))<nsw> LoopDispositions: { %bb6: Computable }
+; X32-NEXT: --> ({0,+,1}<nw><%bb6> * (1 smin {0,+,4}<nuw><nsw><%bb6>))<nuw><nsw> U: [0,1073741824) S: [0,1073741824) Exits: (((zext i32* (-4 + (-1 * %arg) + %arg1) to i64) /u 4) * (1 smin (4 * ((zext i32* (-4 + (-1 * %arg) + %arg1) to i64) /u 4))<nuw><nsw>))<nuw><nsw> LoopDispositions: { %bb6: Computable }
; X32-NEXT: %i12 = getelementptr inbounds i32, i32* %arg2, i64 %i11
-; X32-NEXT: --> ((4 * (trunc i64 (((((zext i32 (ptrtoint i32* {%arg,+,4}<nuw><%bb6> to i32) to i64) + (-1 * (zext i32 (ptrtoint i32* %arg to i32) to i64))<nsw>) smax ((zext i32 (ptrtoint i32* %arg to i32) to i64) + (-1 * (zext i32 (ptrtoint i32* {%arg,+,4}<nuw><%bb6> to i32) to i64))<nsw>)) /u 4) * (1 smin (-1 smax ((zext i32 (ptrtoint i32* {%arg,+,4}<nuw><%bb6> to i32) to i64) + (-1 * (zext i32 (ptrtoint i32* %arg to i32) to i64))<nsw>))))<nsw> to i32))<nsw> + %arg2)<nsw> U: full-set S: full-set Exits: ((4 * (trunc i64 (((((zext i32 (ptrtoint i32* ((4 * ((-4 + (-1 * %arg) + %arg1) /u 4))<nuw> + %arg) to i32) to i64) + (-1 * (zext i32 (ptrtoint i32* %arg to i32) to i64))<nsw>) smax ((zext i32 (ptrtoint i32* %arg to i32) to i64) + (-1 * (zext i32 (ptrtoint i32* ((4 * ((-4 + (-1 * %arg) + %arg1) /u 4))<nuw> + %arg) to i32) to i64))<nsw>)) /u 4) * (1 smin (-1 smax ((zext i32 (ptrtoint i32* ((4 * ((-4 + (-1 * %arg) + %arg1) /u 4))<nuw> + %arg) to i32) to i64) + (-1 * (zext i32 (ptrtoint i32* %arg to i32) to i64))<nsw>))))<nsw> to i32))<nsw> + %arg2)<nsw> LoopDispositions: { %bb6: Computable }
+; X32-NEXT: --> (((trunc i64 (1 smin {0,+,4}<nuw><nsw><%bb6>) to i32) * {0,+,4}<%bb6>) + %arg2)<nsw> U: full-set S: full-set Exits: ((4 * (trunc i64 (1 smin (4 * ((zext i32* (-4 + (-1 * %arg) + %arg1) to i64) /u 4))<nuw><nsw>) to i32) * ((-4 + (-1 * %arg) + %arg1) /u 4)) + %arg2)<nsw> LoopDispositions: { %bb6: Computable }
; X32-NEXT: %i13 = load i32, i32* %i12, align 4
; X32-NEXT: --> %i13 U: full-set S: full-set Exits: <<Unknown>> LoopDispositions: { %bb6: Variant }
; X32-NEXT: %i14 = add nsw i32 %i13, %i8
diff --git a/llvm/test/Transforms/LoopStrengthReduce/X86/expander-crashes.ll b/llvm/test/Transforms/LoopStrengthReduce/X86/expander-crashes.ll
index c895a10ba110..1525b811c0ca 100644
--- a/llvm/test/Transforms/LoopStrengthReduce/X86/expander-crashes.ll
+++ b/llvm/test/Transforms/LoopStrengthReduce/X86/expander-crashes.ll
@@ -11,44 +11,42 @@ target triple = "x86_64-apple-macosx10.15.0"
define i64 @blam(%struct.hoge* %start, %struct.hoge* %end, %struct.hoge* %ptr.2) {
; CHECK-LABEL: @blam(
; CHECK-NEXT: entry:
-; CHECK-NEXT: [[END16:%.*]] = bitcast %struct.hoge* [[END:%.*]] to i8*
-; CHECK-NEXT: [[START17:%.*]] = ptrtoint %struct.hoge* [[START:%.*]] to i64
-; CHECK-NEXT: [[SCEVGEP12:%.*]] = getelementptr [[STRUCT_HOGE:%.*]], %struct.hoge* [[START]], i64 0, i32 3
-; CHECK-NEXT: [[SCEVGEP1213:%.*]] = bitcast i32* [[SCEVGEP12]] to %struct.hoge*
-; CHECK-NEXT: [[TMP0:%.*]] = sub i64 0, [[START17]]
-; CHECK-NEXT: [[UGLYGEP18:%.*]] = getelementptr i8, i8* [[END16]], i64 [[TMP0]]
-; CHECK-NEXT: [[UGLYGEP1819:%.*]] = bitcast i8* [[UGLYGEP18]] to %struct.hoge*
+; CHECK-NEXT: [[START9:%.*]] = ptrtoint %struct.hoge* [[START:%.*]] to i64
+; CHECK-NEXT: [[START6:%.*]] = bitcast %struct.hoge* [[START]] to i8*
+; CHECK-NEXT: [[END8:%.*]] = bitcast %struct.hoge* [[END:%.*]] to i8*
+; CHECK-NEXT: [[TMP0:%.*]] = ptrtoint %struct.hoge* [[START]] to i64
+; CHECK-NEXT: [[TMP1:%.*]] = sub i64 0, [[START9]]
+; CHECK-NEXT: [[UGLYGEP10:%.*]] = getelementptr i8, i8* [[END8]], i64 [[TMP1]]
; CHECK-NEXT: br label [[LOOP_1_HEADER:%.*]]
; CHECK: loop.1.header:
-; CHECK-NEXT: [[LSR_IV20:%.*]] = phi %struct.hoge* [ [[SCEVGEP21:%.*]], [[LOOP_1_HEADER]] ], [ [[UGLYGEP1819]], [[ENTRY:%.*]] ]
-; CHECK-NEXT: [[LSR_IV14:%.*]] = phi %struct.hoge* [ [[SCEVGEP15:%.*]], [[LOOP_1_HEADER]] ], [ [[SCEVGEP1213]], [[ENTRY]] ]
-; CHECK-NEXT: [[SCEVGEP15]] = getelementptr [[STRUCT_HOGE]], %struct.hoge* [[LSR_IV14]], i64 1
-; CHECK-NEXT: [[SCEVGEP21]] = getelementptr [[STRUCT_HOGE]], %struct.hoge* [[LSR_IV20]], i64 -1
-; CHECK-NEXT: [[EC:%.*]] = icmp eq %struct.hoge* [[SCEVGEP21]], null
+; CHECK-NEXT: [[LSR_IV4:%.*]] = phi i64 [ [[LSR_IV_NEXT5:%.*]], [[LOOP_1_HEADER]] ], [ 0, [[ENTRY:%.*]] ]
+; CHECK-NEXT: [[LSR_IV_NEXT5]] = add i64 [[LSR_IV4]], -16
+; CHECK-NEXT: [[SCEVGEP11:%.*]] = getelementptr i8, i8* [[UGLYGEP10]], i64 [[LSR_IV_NEXT5]]
+; CHECK-NEXT: [[SCEVGEP1112:%.*]] = bitcast i8* [[SCEVGEP11]] to %struct.hoge*
+; CHECK-NEXT: [[EC:%.*]] = icmp eq %struct.hoge* [[SCEVGEP1112]], null
; CHECK-NEXT: br i1 [[EC]], label [[LOOP_2_PH:%.*]], label [[LOOP_1_HEADER]]
; CHECK: loop.2.ph:
+; CHECK-NEXT: [[TMP2:%.*]] = sub i64 [[TMP0]], [[LSR_IV_NEXT5]]
+; CHECK-NEXT: [[TMP3:%.*]] = mul i64 [[LSR_IV_NEXT5]], -1
+; CHECK-NEXT: [[UGLYGEP:%.*]] = getelementptr i8, i8* [[START6]], i64 [[TMP3]]
+; CHECK-NEXT: [[UGLYGEP7:%.*]] = bitcast i8* [[UGLYGEP]] to %struct.hoge*
; CHECK-NEXT: br label [[LOOP_2_HEADER:%.*]]
; CHECK: loop.2.header:
-; CHECK-NEXT: [[LSR_IV3:%.*]] = phi %struct.hoge* [ [[SCEVGEP4:%.*]], [[LOOP_2_LATCH:%.*]] ], [ [[SCEVGEP15]], [[LOOP_2_PH]] ]
-; CHECK-NEXT: [[LSR_IV310:%.*]] = bitcast %struct.hoge* [[LSR_IV3]] to i32*
-; CHECK-NEXT: [[LSR_IV37:%.*]] = bitcast %struct.hoge* [[LSR_IV3]] to i8*
-; CHECK-NEXT: [[UGLYGEP8:%.*]] = getelementptr i8, i8* [[LSR_IV37]], i64 -12
-; CHECK-NEXT: [[UGLYGEP89:%.*]] = bitcast i8* [[UGLYGEP8]] to %struct.hoge*
-; CHECK-NEXT: [[LSR_IV35:%.*]] = bitcast %struct.hoge* [[LSR_IV3]] to i8*
-; CHECK-NEXT: [[TMP8:%.*]] = ptrtoint i32* [[LSR_IV310]] to i64
-; CHECK-NEXT: call void @use.i64(i64 [[TMP8]])
-; CHECK-NEXT: [[SCEVGEP11:%.*]] = getelementptr i32, i32* [[LSR_IV310]], i64 -1
-; CHECK-NEXT: store i32 10, i32* [[SCEVGEP11]], align 8
-; CHECK-NEXT: [[EC_2:%.*]] = icmp ugt %struct.hoge* [[UGLYGEP89]], [[PTR_2:%.*]]
+; CHECK-NEXT: [[LSR_IV1:%.*]] = phi i64 [ [[LSR_IV_NEXT2:%.*]], [[LOOP_2_LATCH:%.*]] ], [ [[TMP2]], [[LOOP_2_PH]] ]
+; CHECK-NEXT: [[IV2:%.*]] = phi %struct.hoge* [ [[IV2_NEXT:%.*]], [[LOOP_2_LATCH]] ], [ [[UGLYGEP7]], [[LOOP_2_PH]] ]
+; CHECK-NEXT: [[IV23:%.*]] = bitcast %struct.hoge* [[IV2]] to i32*
+; CHECK-NEXT: [[TMP4:%.*]] = add i64 [[LSR_IV1]], 12
+; CHECK-NEXT: call void @use.i64(i64 [[TMP4]])
+; CHECK-NEXT: [[SCEVGEP:%.*]] = getelementptr i32, i32* [[IV23]], i64 2
+; CHECK-NEXT: store i32 10, i32* [[SCEVGEP]], align 8
+; CHECK-NEXT: [[EC_2:%.*]] = icmp ugt %struct.hoge* [[IV2]], [[PTR_2:%.*]]
; CHECK-NEXT: br i1 [[EC_2]], label [[LOOP_2_EXIT:%.*]], label [[LOOP_2_LATCH]]
; CHECK: loop.2.latch:
-; CHECK-NEXT: [[SCEVGEP4]] = getelementptr [[STRUCT_HOGE]], %struct.hoge* [[LSR_IV3]], i64 1
+; CHECK-NEXT: [[IV2_NEXT]] = getelementptr inbounds [[STRUCT_HOGE:%.*]], %struct.hoge* [[IV2]], i64 1
+; CHECK-NEXT: [[LSR_IV_NEXT2]] = add i64 [[LSR_IV1]], 16
; CHECK-NEXT: br label [[LOOP_2_HEADER]]
; CHECK: loop.2.exit:
-; CHECK-NEXT: [[UGLYGEP:%.*]] = getelementptr i8, i8* [[LSR_IV35]], i64 -12
-; CHECK-NEXT: [[UGLYGEP6:%.*]] = bitcast i8* [[UGLYGEP]] to %struct.hoge*
-; CHECK-NEXT: [[IV2_CAST:%.*]] = ptrtoint %struct.hoge* [[UGLYGEP6]] to i64
-; CHECK-NEXT: ret i64 [[IV2_CAST]]
+; CHECK-NEXT: ret i64 [[LSR_IV1]]
;
entry:
br label %loop.1.header
diff --git a/polly/test/ScopInfo/int2ptr_ptr2int.ll b/polly/test/ScopInfo/int2ptr_ptr2int.ll
index 9618ea068e1b..2a0b69c7536f 100644
--- a/polly/test/ScopInfo/int2ptr_ptr2int.ll
+++ b/polly/test/ScopInfo/int2ptr_ptr2int.ll
@@ -17,25 +17,25 @@
; CHECK-NEXT: [val, ptr] -> { Stmt_for_body[i0] -> MemRef_A[9 + ptr] };
;
; IR: polly.stmt.for.body:
-; IR-NEXT: %p_tmp1 = inttoptr i64 %0 to i64*
+; IR-NEXT: %p_tmp1 = inttoptr i64 %14 to i64*
; IR-NEXT: %p_add.ptr2 = getelementptr inbounds i64, i64* %p_tmp1, i64 1
; IR-NEXT: %p_tmp2 = ptrtoint i64* %p_add.ptr2 to i64
; IR-NEXT: %p_arrayidx = getelementptr inbounds i64, i64* %A, i64 %p_tmp2
; IR-NEXT: %tmp3_p_scalar_ = load i64, i64* %p_arrayidx, align 8, !alias.scope !0, !noalias !2
-; IR-NEXT: %tmp4_p_scalar_ = load i64, i64* %scevgep1, align 8, !alias.scope !0, !noalias !2
+; IR-NEXT: %tmp4_p_scalar_ = load i64, i64* %scevgep, align 8, !alias.scope !0, !noalias !2
; IR-NEXT: %p_add4 = add nsw i64 %tmp4_p_scalar_, %tmp3_p_scalar_
-; IR-NEXT: store i64 %p_add4, i64* %scevgep1, align 8, !alias.scope !0, !noalias !2
+; IR-NEXT: store i64 %p_add4, i64* %scevgep, align 8, !alias.scope !0, !noalias !2
; IR-NEXT: %polly.indvar_next = add nsw i64 %polly.indvar, 1
; IR-NEXT: %polly.loop_cond = icmp sle i64 %polly.indvar_next, 99
; IR-NEXT: br i1 %polly.loop_cond, label %polly.loop_header, label %polly.loop_exit
;
; IR: polly.loop_preheader:
-; IR-NEXT: %0 = add i64 %val, 1
-; IR-NEXT: %scevgep = getelementptr i64, i64* %ptr, i32 1
-; IR-NEXT: %1 = ptrtoint i64* %scevgep to i32
-; IR-NEXT: %2 = add i32 %1, 1
-; IR-NEXT: %scevgep1 = getelementptr i64, i64* %A, i32 %2
+; IR-NEXT: %14 = add i64 %val, 1
+; IR-NEXT: %15 = ptrtoint i64* %ptr to i32
+; IR-NEXT: %16 = add i32 %15, 9
+; IR-NEXT: %scevgep = getelementptr i64, i64* %A, i32 %16
; IR-NEXT: br label %polly.loop_header
+
;
target datalayout = "e-p:32:32:32-m:e-i64:64-f80:128-n8:16:32:64-S128"
diff --git a/polly/test/ScopInfo/int2ptr_ptr2int_2.ll b/polly/test/ScopInfo/int2ptr_ptr2int_2.ll
index 894f5f308a07..c0bd80b1e242 100644
--- a/polly/test/ScopInfo/int2ptr_ptr2int_2.ll
+++ b/polly/test/ScopInfo/int2ptr_ptr2int_2.ll
@@ -13,7 +13,7 @@
;
; CHECK: ReadAccess := [Reduction Type: NONE] [Scalar: 0]
; CHECK-NEXT: [val, ptr] -> { Stmt_for_body[i0] -> MemRef_B[9 + val] };
-; CHECK-NEXT: Execution Context: [val, ptr] -> { : val <= 32766 }
+; CHECK-NEXT: Execution Context: [val, ptr] -> { : -4097 <= val <= 4086 }
;
; CHECK: ReadAccess := [Reduction Type: +] [Scalar: 0]
; CHECK-NEXT: [val, ptr] -> { Stmt_for_body[i0] -> MemRef_A[9 + ptr] };
@@ -21,19 +21,18 @@
; CHECK-NEXT: [val, ptr] -> { Stmt_for_body[i0] -> MemRef_A[9 + ptr] };
;
; IR: polly.stmt.for.body:
-; IR-NEXT: %tmp4_p_scalar_ = load i64, i64* %scevgep13, align 8, !alias.scope !3, !noalias !4
+; IR-NEXT: %tmp4_p_scalar_ = load i64, i64* %scevgep, align 8, !alias.scope !3, !noalias !4
; IR-NEXT: %p_add4 = add nsw i64 %tmp4_p_scalar_, %polly.preload.tmp3.merge
-; IR-NEXT: store i64 %p_add4, i64* %scevgep13, align 8, !alias.scope !3, !noalias !4
+; IR-NEXT: store i64 %p_add4, i64* %scevgep, align 8, !alias.scope !3, !noalias !4
; IR-NEXT: %polly.indvar_next = add nsw i64 %polly.indvar, 1
; IR-NEXT: %polly.loop_cond = icmp sle i64 %polly.indvar_next, 99
; IR-NEXT: br i1 %polly.loop_cond, label %polly.loop_header, label %polly.loop_exit
-;
+
; IR: polly.loop_preheader:
-; IR-NEXT: %35 = add i16 %val, 1
-; IR-NEXT: %scevgep = getelementptr i64, i64* %ptr, i16 1
-; IR-NEXT: %36 = ptrtoint i64* %scevgep to i16
-; IR-NEXT: %37 = add i16 %36, 1
-; IR-NEXT: %scevgep13 = getelementptr i64, i64* %A, i16 %37
+; IR-NEXT: %41 = add i16 %val, 1
+; IR-NEXT: %42 = ptrtoint i64* %ptr to i16
+; IR-NEXT: %43 = add i16 %42, 9
+; IR-NEXT: %scevgep = getelementptr i64, i64* %A, i16 %43
; IR-NEXT: br label %polly.loop_header
;
target datalayout = "e-p:16:16:16-m:e-i64:64-f80:128-n8:16:16:64-S128"
</cut>
3 years, 10 months
- 1
- 0
[CI-NOTIFY]: TCWG Bisect tcwg_bmk_tk1/llvm-release-arm-spec2k6-Os - Build # 15 - Successful!
by ci_notify＠linaro.org
Successfully identified regression in *llvm* in CI configuration tcwg_bmk_llvm_tk1/llvm-release-arm-spec2k6-Os. So far, this commit has regressed CI configurations:
- tcwg_bmk_llvm_tk1/llvm-release-arm-spec2k6-Os
Culprit:
<cut>
commit 3a2b05f9fe74fcf9560632cf2695058d47d8683b
Author: Evgeniy Brevnov <ybrevnov(a)azul.com>
Date: Fri Jul 24 18:57:10 2020 +0700
[BPI][NFC] Consolidate code to deal with SCCs under a dedicated data structure.
In order to facilitate review of D79485 here is a small NFC change which restructures code around handling of SCCs in BPI.
Reviewed By: davidxl
Differential Revision: https://reviews.llvm.org/D84514
</cut>
Results regressed to (for first_bad == 3a2b05f9fe74fcf9560632cf2695058d47d8683b)
# reset_artifacts:
-10
# build_abe binutils:
-9
# build_abe stage1 -- --set gcc_override_configure=--with-mode=thumb --set gcc_override_configure=--disable-libsanitizer:
-8
# build_abe linux:
-7
# build_abe glibc:
-6
# build_abe stage2 -- --set gcc_override_configure=--with-mode=thumb --set gcc_override_configure=--disable-libsanitizer:
-5
# build_llvm true:
-3
# true:
0
# benchmark -Os_mthumb -- artifacts/build-3a2b05f9fe74fcf9560632cf2695058d47d8683b/results_id:
1
# 401.bzip2,bzip2_base.default regressed by 104
from (for last_good == 7294ca3f6ecacd05a197bbf0637e10afcb99b6d6)
# reset_artifacts:
-10
# build_abe binutils:
-9
# build_abe stage1 -- --set gcc_override_configure=--with-mode=thumb --set gcc_override_configure=--disable-libsanitizer:
-8
# build_abe linux:
-7
# build_abe glibc:
-6
# build_abe stage2 -- --set gcc_override_configure=--with-mode=thumb --set gcc_override_configure=--disable-libsanitizer:
-5
# build_llvm true:
-3
# true:
0
# benchmark -Os_mthumb -- artifacts/build-7294ca3f6ecacd05a197bbf0637e10afcb99b6d6/results_id:
1
Artifacts of last_good build: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tk1-llvm-release…
Results ID of last_good: tk1_32/tcwg_bmk_llvm_tk1/bisect-llvm-release-arm-spec2k6-Os/699
Artifacts of first_bad build: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tk1-llvm-release…
Results ID of first_bad: tk1_32/tcwg_bmk_llvm_tk1/bisect-llvm-release-arm-spec2k6-Os/688
Build top page/logs: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tk1-llvm-release…
Configuration details:
Reproduce builds:
<cut>
mkdir investigate-llvm-3a2b05f9fe74fcf9560632cf2695058d47d8683b
cd investigate-llvm-3a2b05f9fe74fcf9560632cf2695058d47d8683b
git clone https://git.linaro.org/toolchain/jenkins-scripts
mkdir -p artifacts/manifests
curl -o artifacts/manifests/build-baseline.sh https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tk1-llvm-release… --fail
curl -o artifacts/manifests/build-parameters.sh https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tk1-llvm-release… --fail
curl -o artifacts/test.sh https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tk1-llvm-release… --fail
chmod +x artifacts/test.sh
# Reproduce the baseline build (build all pre-requisites)
./jenkins-scripts/tcwg_bmk-build.sh @@ artifacts/manifests/build-baseline.sh
cd llvm
# Reproduce first_bad build
git checkout --detach 3a2b05f9fe74fcf9560632cf2695058d47d8683b
../artifacts/test.sh
# Reproduce last_good build
git checkout --detach 7294ca3f6ecacd05a197bbf0637e10afcb99b6d6
../artifacts/test.sh
cd ..
</cut>
History of pending regressions and results: https://git.linaro.org/toolchain/ci/base-artifacts.git/log/?h=linaro-local/…
Artifacts: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tk1-llvm-release…
Build log: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tk1-llvm-release…
Full commit (up to 1000 lines):
<cut>
commit 3a2b05f9fe74fcf9560632cf2695058d47d8683b
Author: Evgeniy Brevnov <ybrevnov(a)azul.com>
Date: Fri Jul 24 18:57:10 2020 +0700
[BPI][NFC] Consolidate code to deal with SCCs under a dedicated data structure.
In order to facilitate review of D79485 here is a small NFC change which restructures code around handling of SCCs in BPI.
Reviewed By: davidxl
Differential Revision: https://reviews.llvm.org/D84514
---
llvm/include/llvm/Analysis/BranchProbabilityInfo.h | 71 ++++++++-
llvm/lib/Analysis/BranchProbabilityInfo.cpp | 164 +++++++++++++--------
2 files changed, 169 insertions(+), 66 deletions(-)
diff --git a/llvm/include/llvm/Analysis/BranchProbabilityInfo.h b/llvm/include/llvm/Analysis/BranchProbabilityInfo.h
index 3e72afba36c3..7feb5b625938 100644
--- a/llvm/include/llvm/Analysis/BranchProbabilityInfo.h
+++ b/llvm/include/llvm/Analysis/BranchProbabilityInfo.h
@@ -151,13 +151,66 @@ public:
/// Forget analysis results for the given basic block.
void eraseBlock(const BasicBlock *BB);
- // Use to track SCCs for handling irreducible loops.
- using SccMap = DenseMap<const BasicBlock *, int>;
- using SccHeaderMap = DenseMap<const BasicBlock *, bool>;
- using SccHeaderMaps = std::vector<SccHeaderMap>;
- struct SccInfo {
+ class SccInfo {
+ // Enum of types to classify basic blocks in SCC. Basic block belonging to
+ // SCC is 'Inner' until it is either 'Header' or 'Exiting'. Note that a
+ // basic block can be 'Header' and 'Exiting' at the same time.
+ enum SccBlockType {
+ Inner = 0x0,
+ Header = 0x1,
+ Exiting = 0x2,
+ };
+ // Map of basic blocks to SCC IDs they belong to. If basic block doesn't
+ // belong to any SCC it is not in the map.
+ using SccMap = DenseMap<const BasicBlock *, int>;
+ // Each basic block in SCC is attributed with one or several types from
+ // SccBlockType. Map value has uint32_t type (instead of SccBlockType)
+ // since basic block may be for example "Header" and "Exiting" at the same
+ // time and we need to be able to keep more than one value from
+ // SccBlockType.
+ using SccBlockTypeMap = DenseMap<const BasicBlock *, uint32_t>;
+ // Vector containing classification of basic blocks for all SCCs where i'th
+ // vector element corresponds to SCC with ID equal to i.
+ using SccBlockTypeMaps = std::vector<SccBlockTypeMap>;
+
SccMap SccNums;
- SccHeaderMaps SccHeaders;
+ SccBlockTypeMaps SccBlocks;
+
+ public:
+ explicit SccInfo(const Function &F);
+
+ /// If \p BB belongs to some SCC then ID of that SCC is returned, otherwise
+ /// -1 is returned. If \p BB belongs to more than one SCC at the same time
+ /// result is undefined.
+ int getSCCNum(const BasicBlock *BB) const;
+ /// Returns true if \p BB is a 'header' block in SCC with \p SccNum ID,
+ /// false otherwise.
+ bool isSCCHeader(const BasicBlock *BB, int SccNum) const {
+ return getSccBlockType(BB, SccNum) & Header;
+ }
+ /// Returns true if \p BB is an 'exiting' block in SCC with \p SccNum ID,
+ /// false otherwise.
+ bool isSCCExitingBlock(const BasicBlock *BB, int SccNum) const {
+ return getSccBlockType(BB, SccNum) & Exiting;
+ }
+ /// Fills in \p Enters vector with all such blocks that don't belong to
+ /// SCC with \p SccNum ID but there is an edge to a block belonging to the
+ /// SCC.
+ void getSccEnterBlocks(int SccNum,
+ SmallVectorImpl<BasicBlock *> &Enters) const;
+ /// Fills in \p Exits vector with all such blocks that don't belong to
+ /// SCC with \p SccNum ID but there is an edge from a block belonging to the
+ /// SCC.
+ void getSccExitBlocks(int SccNum,
+ SmallVectorImpl<BasicBlock *> &Exits) const;
+
+ private:
+ /// Returns \p BB's type according to classification given by SccBlockType
+ /// enum. Please note that \p BB must belong to SSC with \p SccNum ID.
+ uint32_t getSccBlockType(const BasicBlock *BB, int SccNum) const;
+ /// Calculates \p BB's type and stores it in internal data structures for
+ /// future use. Please note that \p BB must belong to SSC with \p SccNum ID.
+ void calculateSccBlockType(const BasicBlock *BB, int SccNum);
};
private:
@@ -196,6 +249,9 @@ private:
/// Track the last function we run over for printing.
const Function *LastF = nullptr;
+ /// Keeps information about all SCCs in a function.
+ std::unique_ptr<const SccInfo> SccI;
+
/// Track the set of blocks directly succeeded by a returning block.
SmallPtrSet<const BasicBlock *, 16> PostDominatedByUnreachable;
@@ -210,8 +266,7 @@ private:
bool calcMetadataWeights(const BasicBlock *BB);
bool calcColdCallHeuristics(const BasicBlock *BB);
bool calcPointerHeuristics(const BasicBlock *BB);
- bool calcLoopBranchHeuristics(const BasicBlock *BB, const LoopInfo &LI,
- SccInfo &SccI);
+ bool calcLoopBranchHeuristics(const BasicBlock *BB, const LoopInfo &LI);
bool calcZeroHeuristics(const BasicBlock *BB, const TargetLibraryInfo *TLI);
bool calcFloatingPointHeuristics(const BasicBlock *BB);
bool calcInvokeHeuristics(const BasicBlock *BB);
diff --git a/llvm/lib/Analysis/BranchProbabilityInfo.cpp b/llvm/lib/Analysis/BranchProbabilityInfo.cpp
index a396b5ad21c6..195fc69d9601 100644
--- a/llvm/lib/Analysis/BranchProbabilityInfo.cpp
+++ b/llvm/lib/Analysis/BranchProbabilityInfo.cpp
@@ -148,6 +148,105 @@ static const uint32_t IH_TAKEN_WEIGHT = 1024 * 1024 - 1;
/// instruction. This is essentially never taken.
static const uint32_t IH_NONTAKEN_WEIGHT = 1;
+BranchProbabilityInfo::SccInfo::SccInfo(const Function &F) {
+ // Record SCC numbers of blocks in the CFG to identify irreducible loops.
+ // FIXME: We could only calculate this if the CFG is known to be irreducible
+ // (perhaps cache this info in LoopInfo if we can easily calculate it there?).
+ int SccNum = 0;
+ for (scc_iterator<const Function *> It = scc_begin(&F); !It.isAtEnd();
+ ++It, ++SccNum) {
+ // Ignore single-block SCCs since they either aren't loops or LoopInfo will
+ // catch them.
+ const std::vector<const BasicBlock *> &Scc = *It;
+ if (Scc.size() == 1)
+ continue;
+
+ LLVM_DEBUG(dbgs() << "BPI: SCC " << SccNum << ":");
+ for (const auto *BB : Scc) {
+ LLVM_DEBUG(dbgs() << " " << BB->getName());
+ SccNums[BB] = SccNum;
+ calculateSccBlockType(BB, SccNum);
+ }
+ LLVM_DEBUG(dbgs() << "\n");
+ }
+}
+
+int BranchProbabilityInfo::SccInfo::getSCCNum(const BasicBlock *BB) const {
+ auto SccIt = SccNums.find(BB);
+ if (SccIt == SccNums.end())
+ return -1;
+ return SccIt->second;
+}
+
+void BranchProbabilityInfo::SccInfo::getSccEnterBlocks(
+ int SccNum, SmallVectorImpl<BasicBlock *> &Enters) const {
+
+ for (auto MapIt : SccBlocks[SccNum]) {
+ const auto *BB = MapIt.first;
+ if (isSCCHeader(BB, SccNum))
+ for (const auto *Pred : predecessors(BB))
+ if (getSCCNum(Pred) != SccNum)
+ Enters.push_back(const_cast<BasicBlock *>(BB));
+ }
+}
+
+void BranchProbabilityInfo::SccInfo::getSccExitBlocks(
+ int SccNum, SmallVectorImpl<BasicBlock *> &Exits) const {
+ for (auto MapIt : SccBlocks[SccNum]) {
+ const auto *BB = MapIt.first;
+ if (isSCCExitingBlock(BB, SccNum))
+ for (const auto *Succ : successors(BB))
+ if (getSCCNum(Succ) != SccNum)
+ Exits.push_back(const_cast<BasicBlock *>(BB));
+ }
+}
+
+uint32_t BranchProbabilityInfo::SccInfo::getSccBlockType(const BasicBlock *BB,
+ int SccNum) const {
+ assert(getSCCNum(BB) == SccNum);
+
+ assert(SccBlocks.size() > static_cast<unsigned>(SccNum) && "Unknown SCC");
+ const auto &SccBlockTypes = SccBlocks[SccNum];
+
+ auto It = SccBlockTypes.find(BB);
+ if (It != SccBlockTypes.end()) {
+ return It->second;
+ }
+ return Inner;
+}
+
+void BranchProbabilityInfo::SccInfo::calculateSccBlockType(const BasicBlock *BB,
+ int SccNum) {
+ assert(getSCCNum(BB) == SccNum);
+ uint32_t BlockType = Inner;
+
+ if (llvm::any_of(make_range(pred_begin(BB), pred_end(BB)),
+ [&](const BasicBlock *Pred) {
+ // Consider any block that is an entry point to the SCC as
+ // a header.
+ return getSCCNum(Pred) != SccNum;
+ }))
+ BlockType |= Header;
+
+ if (llvm::any_of(
+ make_range(succ_begin(BB), succ_end(BB)),
+ [&](const BasicBlock *Succ) { return getSCCNum(Succ) != SccNum; }))
+ BlockType |= Exiting;
+
+ // Lazily compute the set of headers for a given SCC and cache the results
+ // in the SccHeaderMap.
+ if (SccBlocks.size() <= static_cast<unsigned>(SccNum))
+ SccBlocks.resize(SccNum + 1);
+ auto &SccBlockTypes = SccBlocks[SccNum];
+
+ if (BlockType != Inner) {
+ bool IsInserted;
+ std::tie(std::ignore, IsInserted) =
+ SccBlockTypes.insert(std::make_pair(BB, BlockType));
+ assert(IsInserted && "Duplicated block in SCC");
+ }
+}
+
static void UpdatePDTWorklist(const BasicBlock *BB, PostDominatorTree *PDT,
SmallVectorImpl<const BasicBlock *> &WorkList,
SmallPtrSetImpl<const BasicBlock *> &TargetSet) {
@@ -511,38 +610,6 @@ bool BranchProbabilityInfo::calcPointerHeuristics(const BasicBlock *BB) {
return true;
}
-static int getSCCNum(const BasicBlock *BB,
- const BranchProbabilityInfo::SccInfo &SccI) {
- auto SccIt = SccI.SccNums.find(BB);
- if (SccIt == SccI.SccNums.end())
- return -1;
- return SccIt->second;
-}
-
-// Consider any block that is an entry point to the SCC as a header.
-static bool isSCCHeader(const BasicBlock *BB, int SccNum,
- BranchProbabilityInfo::SccInfo &SccI) {
- assert(getSCCNum(BB, SccI) == SccNum);
-
- // Lazily compute the set of headers for a given SCC and cache the results
- // in the SccHeaderMap.
- if (SccI.SccHeaders.size() <= static_cast<unsigned>(SccNum))
- SccI.SccHeaders.resize(SccNum + 1);
- auto &HeaderMap = SccI.SccHeaders[SccNum];
- bool Inserted;
- BranchProbabilityInfo::SccHeaderMap::iterator HeaderMapIt;
- std::tie(HeaderMapIt, Inserted) = HeaderMap.insert(std::make_pair(BB, false));
- if (Inserted) {
- bool IsHeader = llvm::any_of(make_range(pred_begin(BB), pred_end(BB)),
- [&](const BasicBlock *Pred) {
- return getSCCNum(Pred, SccI) != SccNum;
- });
- HeaderMapIt->second = IsHeader;
- return IsHeader;
- } else
- return HeaderMapIt->second;
-}
-
// Compute the unlikely successors to the block BB in the loop L, specifically
// those that are unlikely because this is a loop, and add them to the
// UnlikelyBlocks set.
@@ -653,12 +720,11 @@ computeUnlikelySuccessors(const BasicBlock *BB, Loop *L,
// Calculate Edge Weights using "Loop Branch Heuristics". Predict backedges
// as taken, exiting edges as not-taken.
bool BranchProbabilityInfo::calcLoopBranchHeuristics(const BasicBlock *BB,
- const LoopInfo &LI,
- SccInfo &SccI) {
+ const LoopInfo &LI) {
int SccNum;
Loop *L = LI.getLoopFor(BB);
if (!L) {
- SccNum = getSCCNum(BB, SccI);
+ SccNum = SccI->getSCCNum(BB);
if (SccNum < 0)
return false;
}
@@ -685,9 +751,9 @@ bool BranchProbabilityInfo::calcLoopBranchHeuristics(const BasicBlock *BB,
else
InEdges.push_back(I.getSuccessorIndex());
} else {
- if (getSCCNum(*I, SccI) != SccNum)
+ if (SccI->getSCCNum(*I) != SccNum)
ExitingEdges.push_back(I.getSuccessorIndex());
- else if (isSCCHeader(*I, SccNum, SccI))
+ else if (SccI->isSCCHeader(*I, SccNum))
BackEdges.push_back(I.getSuccessorIndex());
else
InEdges.push_back(I.getSuccessorIndex());
@@ -1072,26 +1138,7 @@ void BranchProbabilityInfo::calculate(const Function &F, const LoopInfo &LI,
assert(PostDominatedByUnreachable.empty());
assert(PostDominatedByColdCall.empty());
- // Record SCC numbers of blocks in the CFG to identify irreducible loops.
- // FIXME: We could only calculate this if the CFG is known to be irreducible
- // (perhaps cache this info in LoopInfo if we can easily calculate it there?).
- int SccNum = 0;
- SccInfo SccI;
- for (scc_iterator<const Function *> It = scc_begin(&F); !It.isAtEnd();
- ++It, ++SccNum) {
- // Ignore single-block SCCs since they either aren't loops or LoopInfo will
- // catch them.
- const std::vector<const BasicBlock *> &Scc = *It;
- if (Scc.size() == 1)
- continue;
-
- LLVM_DEBUG(dbgs() << "BPI: SCC " << SccNum << ":");
- for (auto *BB : Scc) {
- LLVM_DEBUG(dbgs() << " " << BB->getName());
- SccI.SccNums[BB] = SccNum;
- }
- LLVM_DEBUG(dbgs() << "\n");
- }
+ SccI = std::make_unique<SccInfo>(F);
std::unique_ptr<PostDominatorTree> PDTPtr;
@@ -1119,7 +1166,7 @@ void BranchProbabilityInfo::calculate(const Function &F, const LoopInfo &LI,
continue;
if (calcColdCallHeuristics(BB))
continue;
- if (calcLoopBranchHeuristics(BB, LI, SccI))
+ if (calcLoopBranchHeuristics(BB, LI))
continue;
if (calcPointerHeuristics(BB))
continue;
@@ -1131,6 +1178,7 @@ void BranchProbabilityInfo::calculate(const Function &F, const LoopInfo &LI,
PostDominatedByUnreachable.clear();
PostDominatedByColdCall.clear();
+ SccI.release();
if (PrintBranchProb &&
(PrintBranchProbFuncName.empty() ||
</cut>
3 years, 10 months
- 1
- 0
Binutils help? Aarch64 PE/COFF support to enable UEFI Secure Boot
by Steve McIntyre
Hi folks,
I'm hoping that I might be able to get some development help with
binutils for aarch64...
I'm maintaining the UEFI Secure Boot stack in Debian (shim etc.),
including for arm64/aarch64 (as I wanted to make that work too!). UEFI
binaries are awkward for those of used to the Linux and ELF world -
they're PE/COFF format with different calling conventions to match the
Microsoft world. But we've made things work.
On x86 platforms, the shim build process uses objcopy
--target=efi-app-$(ARCH) to produce the final output binaries. We've
never had similar support for the aarch64 platform, and instead
somebody came up with a method using locally-hacked linker script and
"-O binary" to generate the output binaries. That's worked well
enough for a while, but it's been annoying for various reasons
(particularly debugging problems).
*However*, recently for security reasons we've tweaked the layout of
Secure Boot binaries [1] and this has caused lots of problems. The
older hacks to hand-build the right sections etc. needed significant
extra work, and we're still dealing with awkward bugs related to
this. Based ont these problems, I recently had to make the painful
decision to drop support for arm64 SB in Debian. I know that other
distributions are feeling similar pain. :-(
Rather than continuing to hack on things, I think it's (way past) time
that we did things correctly! We need aarch64 binary format support in
binutils so we can just use it like we do on x86. AFAICS, there is
already a bug open asking for this from last year [2]. Could I please
prevail on some friendly neighourhood aarch64 toolchain engineer to
help with that?
Thanks for considering,
Steve
[1] https://github.com/rhboot/shim/blob/main/SBAT.md
[2] https://sourceware.org/bugzilla/show_bug.cgi?id=26206#add_comment
--
Steve McIntyre, Cambridge, UK. steve(a)einval.com
"...In the UNIX world, people tend to interpret `non-technical user'
as meaning someone who's only ever written one device driver." -- Daniel Pead
3 years, 10 months
- 5
- 6
[CI-NOTIFY]: TCWG Bisect tcwg_bmk_tx1/llvm-master-aarch64-spec2k6-O2_LTO - Build # 15 - Successful!
by ci_notify＠linaro.org
Successfully identified regression in *llvm* in CI configuration tcwg_bmk_llvm_tx1/llvm-master-aarch64-spec2k6-O2_LTO. So far, this commit has regressed CI configurations:
- tcwg_bmk_llvm_tx1/llvm-master-aarch64-spec2k6-O2_LTO
Culprit:
<cut>
commit 8fe62b7af1127691d6732438b322e66ae6d39a03
Author: Max Kazantsev <mkazantsev(a)azul.com>
Date: Thu Apr 22 12:50:38 2021 +0700
[GVN] Introduce loop load PRE
This patch allows PRE of the following type of loads:
```
preheader:
br label %loop
loop:
br i1 ..., label %merge, label %clobber
clobber:
call foo() // Clobbers %p
br label %merge
merge:
...
br i1 ..., label %loop, label %exit
```
Into
```
preheader:
%x0 = load %p
br label %loop
loop:
%x.pre = phi(x0, x2)
br i1 ..., label %merge, label %clobber
clobber:
call foo() // Clobbers %p
%x1 = load %p
br label %merge
merge:
x2 = phi(x.pre, x1)
...
br i1 ..., label %loop, label %exit
```
So instead of loading from %p on every iteration, we load only when the actual clobber happens.
The typical pattern which it is trying to address is: hot loop, with all code inlined and
provably having no side effects, and some side-effecting calls on cold path.
The worst overhead from it is, if we always take clobber block, we make 1 more load
overall (in preheader). It only matters if loop has very few iteration. If clobber block is not taken
at least once, the transform is neutral or profitable.
There are several improvements prospect open up:
- We can sometimes be smarter in loop-exiting blocks via split of critical edges;
- If we have block frequency info, we can handle multiple clobbers. The only obstacle now is that
we don't know if their sum is colder than the header.
Differential Revision: https://reviews.llvm.org/D99926
Reviewed By: reames
</cut>
Results regressed to (for first_bad == 8fe62b7af1127691d6732438b322e66ae6d39a03)
# reset_artifacts:
-10
# build_abe binutils:
-9
# build_abe stage1 -- --set gcc_override_configure=--disable-libsanitizer:
-8
# build_abe linux:
-7
# build_abe glibc:
-6
# build_abe stage2 -- --set gcc_override_configure=--disable-libsanitizer:
-5
# build_llvm true:
-3
# true:
0
# benchmark -O2_LTO -- artifacts/build-8fe62b7af1127691d6732438b322e66ae6d39a03/results_id:
1
# 464.h264ref,h264ref_base.default regressed by 104
from (for last_good == 722d4d8e7585457d407d0639a4ae2610157e06a8)
# reset_artifacts:
-10
# build_abe binutils:
-9
# build_abe stage1 -- --set gcc_override_configure=--disable-libsanitizer:
-8
# build_abe linux:
-7
# build_abe glibc:
-6
# build_abe stage2 -- --set gcc_override_configure=--disable-libsanitizer:
-5
# build_llvm true:
-3
# true:
0
# benchmark -O2_LTO -- artifacts/build-722d4d8e7585457d407d0639a4ae2610157e06a8/results_id:
1
Artifacts of last_good build: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tx1-llvm-master-…
Results ID of last_good: tx1_64/tcwg_bmk_llvm_tx1/bisect-llvm-master-aarch64-spec2k6-O2_LTO/641
Artifacts of first_bad build: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tx1-llvm-master-…
Results ID of first_bad: tx1_64/tcwg_bmk_llvm_tx1/bisect-llvm-master-aarch64-spec2k6-O2_LTO/642
Build top page/logs: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tx1-llvm-master-…
Configuration details:
Reproduce builds:
<cut>
mkdir investigate-llvm-8fe62b7af1127691d6732438b322e66ae6d39a03
cd investigate-llvm-8fe62b7af1127691d6732438b322e66ae6d39a03
git clone https://git.linaro.org/toolchain/jenkins-scripts
mkdir -p artifacts/manifests
curl -o artifacts/manifests/build-baseline.sh https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tx1-llvm-master-… --fail
curl -o artifacts/manifests/build-parameters.sh https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tx1-llvm-master-… --fail
curl -o artifacts/test.sh https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tx1-llvm-master-… --fail
chmod +x artifacts/test.sh
# Reproduce the baseline build (build all pre-requisites)
./jenkins-scripts/tcwg_bmk-build.sh @@ artifacts/manifests/build-baseline.sh
cd llvm
# Reproduce first_bad build
git checkout --detach 8fe62b7af1127691d6732438b322e66ae6d39a03
../artifacts/test.sh
# Reproduce last_good build
git checkout --detach 722d4d8e7585457d407d0639a4ae2610157e06a8
../artifacts/test.sh
cd ..
</cut>
History of pending regressions and results: https://git.linaro.org/toolchain/ci/base-artifacts.git/log/?h=linaro-local/…
Artifacts: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tx1-llvm-master-…
Build log: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tx1-llvm-master-…
Full commit (up to 1000 lines):
<cut>
commit 8fe62b7af1127691d6732438b322e66ae6d39a03
Author: Max Kazantsev <mkazantsev(a)azul.com>
Date: Thu Apr 22 12:50:38 2021 +0700
[GVN] Introduce loop load PRE
This patch allows PRE of the following type of loads:
```
preheader:
br label %loop
loop:
br i1 ..., label %merge, label %clobber
clobber:
call foo() // Clobbers %p
br label %merge
merge:
...
br i1 ..., label %loop, label %exit
```
Into
```
preheader:
%x0 = load %p
br label %loop
loop:
%x.pre = phi(x0, x2)
br i1 ..., label %merge, label %clobber
clobber:
call foo() // Clobbers %p
%x1 = load %p
br label %merge
merge:
x2 = phi(x.pre, x1)
...
br i1 ..., label %loop, label %exit
```
So instead of loading from %p on every iteration, we load only when the actual clobber happens.
The typical pattern which it is trying to address is: hot loop, with all code inlined and
provably having no side effects, and some side-effecting calls on cold path.
The worst overhead from it is, if we always take clobber block, we make 1 more load
overall (in preheader). It only matters if loop has very few iteration. If clobber block is not taken
at least once, the transform is neutral or profitable.
There are several improvements prospect open up:
- We can sometimes be smarter in loop-exiting blocks via split of critical edges;
- If we have block frequency info, we can handle multiple clobbers. The only obstacle now is that
we don't know if their sum is colder than the header.
Differential Revision: https://reviews.llvm.org/D99926
Reviewed By: reames
---
llvm/include/llvm/Transforms/Scalar/GVN.h | 6 ++
llvm/lib/Transforms/Scalar/GVN.cpp | 92 +++++++++++++++++++++++++--
llvm/test/Transforms/GVN/PRE/pre-loop-load.ll | 9 ++-
3 files changed, 98 insertions(+), 9 deletions(-)
diff --git a/llvm/include/llvm/Transforms/Scalar/GVN.h b/llvm/include/llvm/Transforms/Scalar/GVN.h
index 13f55ddcf2d6..70662ca213c3 100644
--- a/llvm/include/llvm/Transforms/Scalar/GVN.h
+++ b/llvm/include/llvm/Transforms/Scalar/GVN.h
@@ -328,6 +328,12 @@ private:
bool PerformLoadPRE(LoadInst *Load, AvailValInBlkVect &ValuesPerBlock,
UnavailBlkVect &UnavailableBlocks);
+ /// Try to replace a load which executes on each loop iteraiton with Phi
+ /// translation of load in preheader and load(s) in conditionally executed
+ /// paths.
+ bool performLoopLoadPRE(LoadInst *Load, AvailValInBlkVect &ValuesPerBlock,
+ UnavailBlkVect &UnavailableBlocks);
+
/// Eliminates partially redundant \p Load, replacing it with \p
/// AvailableLoads (connected by Phis if needed).
void eliminatePartiallyRedundantLoad(
diff --git a/llvm/lib/Transforms/Scalar/GVN.cpp b/llvm/lib/Transforms/Scalar/GVN.cpp
index 846a5cdb33d1..29da739fa16e 100644
--- a/llvm/lib/Transforms/Scalar/GVN.cpp
+++ b/llvm/lib/Transforms/Scalar/GVN.cpp
@@ -91,13 +91,14 @@ using namespace PatternMatch;
#define DEBUG_TYPE "gvn"
-STATISTIC(NumGVNInstr, "Number of instructions deleted");
-STATISTIC(NumGVNLoad, "Number of loads deleted");
-STATISTIC(NumGVNPRE, "Number of instructions PRE'd");
+STATISTIC(NumGVNInstr, "Number of instructions deleted");
+STATISTIC(NumGVNLoad, "Number of loads deleted");
+STATISTIC(NumGVNPRE, "Number of instructions PRE'd");
STATISTIC(NumGVNBlocks, "Number of blocks merged");
-STATISTIC(NumGVNSimpl, "Number of instructions simplified");
+STATISTIC(NumGVNSimpl, "Number of instructions simplified");
STATISTIC(NumGVNEqProp, "Number of equalities propagated");
-STATISTIC(NumPRELoad, "Number of loads PRE'd");
+STATISTIC(NumPRELoad, "Number of loads PRE'd");
+STATISTIC(NumPRELoopLoad, "Number of loop loads PRE'd");
STATISTIC(IsValueFullyAvailableInBlockNumSpeculationsMax,
"Number of blocks speculated as available in "
@@ -1447,6 +1448,84 @@ bool GVN::PerformLoadPRE(LoadInst *Load, AvailValInBlkVect &ValuesPerBlock,
return true;
}
+bool GVN::performLoopLoadPRE(LoadInst *Load, AvailValInBlkVect &ValuesPerBlock,
+ UnavailBlkVect &UnavailableBlocks) {
+ if (!LI)
+ return false;
+
+ const Loop *L = LI->getLoopFor(Load->getParent());
+ // TODO: Generalize to other loop blocks that dominate the latch.
+ if (!L || L->getHeader() != Load->getParent())
+ return false;
+
+ BasicBlock *Preheader = L->getLoopPreheader();
+ BasicBlock *Latch = L->getLoopLatch();
+ if (!Preheader || !Latch)
+ return false;
+
+ Value *LoadPtr = Load->getPointerOperand();
+ // Must be available in preheader.
+ if (!L->isLoopInvariant(LoadPtr))
+ return false;
+
+ // We plan to hoist the load to preheader without introducing a new fault.
+ // In order to do it, we need to prove that we cannot side-exit the loop
+ // once loop header is first entered before execution of the load.
+ if (ICF->isDominatedByICFIFromSameBlock(Load))
+ return false;
+
+ BasicBlock *LoopBlock = nullptr;
+ for (auto *Blocker : UnavailableBlocks) {
+ // Blockers from outside the loop are handled in preheader.
+ if (!L->contains(Blocker))
+ continue;
+
+ // Only allow one loop block. Loop header is not less frequently executed
+ // than each loop block, and likely it is much more frequently executed. But
+ // in case of multiple loop blocks, we need extra information (such as block
+ // frequency info) to understand whether it is profitable to PRE into
+ // multiple loop blocks.
+ if (LoopBlock)
+ return false;
+
+ // Do not sink into inner loops. This may be non-profitable.
+ if (L != LI->getLoopFor(Blocker))
+ return false;
+
+ // Blocks that dominate the latch execute on every single iteration, maybe
+ // except the last one. So PREing into these blocks doesn't make much sense
+ // in most cases. But the blocks that do not necessarily execute on each
+ // iteration are sometimes much colder than the header, and this is when
+ // PRE is potentially profitable.
+ if (DT->dominates(Blocker, Latch))
+ return false;
+
+ // Make sure that the terminator itself doesn't clobber.
+ if (Blocker->getTerminator()->mayWriteToMemory())
+ return false;
+
+ LoopBlock = Blocker;
+ }
+
+ if (!LoopBlock)
+ return false;
+
+ // Make sure the memory at this pointer cannot be freed, therefore we can
+ // safely reload from it after clobber.
+ if (LoadPtr->canBeFreed())
+ return false;
+
+ // TODO: Support critical edge splitting if blocker has more than 1 successor.
+ MapVector<BasicBlock *, Value *> AvailableLoads;
+ AvailableLoads[LoopBlock] = LoadPtr;
+ AvailableLoads[Preheader] = LoadPtr;
+
+ LLVM_DEBUG(dbgs() << "GVN REMOVING PRE LOOP LOAD: " << *Load << '\n');
+ eliminatePartiallyRedundantLoad(Load, ValuesPerBlock, AvailableLoads);
+ ++NumPRELoopLoad;
+ return true;
+}
+
static void reportLoadElim(LoadInst *Load, Value *AvailableValue,
OptimizationRemarkEmitter *ORE) {
using namespace ore;
@@ -1544,7 +1623,8 @@ bool GVN::processNonLocalLoad(LoadInst *Load) {
if (!isLoadInLoopPREEnabled() && LI && LI->getLoopFor(Load->getParent()))
return Changed;
- return Changed || PerformLoadPRE(Load, ValuesPerBlock, UnavailableBlocks);
+ return Changed || PerformLoadPRE(Load, ValuesPerBlock, UnavailableBlocks) ||
+ performLoopLoadPRE(Load, ValuesPerBlock, UnavailableBlocks);
}
static bool impliesEquivalanceIfTrue(CmpInst* Cmp) {
diff --git a/llvm/test/Transforms/GVN/PRE/pre-loop-load.ll b/llvm/test/Transforms/GVN/PRE/pre-loop-load.ll
index 15bc49e7ab9a..8ca12284d5c4 100644
--- a/llvm/test/Transforms/GVN/PRE/pre-loop-load.ll
+++ b/llvm/test/Transforms/GVN/PRE/pre-loop-load.ll
@@ -7,22 +7,25 @@ declare void @may_free_memory()
declare i32 @personality_function()
-; TODO: We can PRE the load from gc-managed memory away from the hot path.
+; We can PRE the load from gc-managed memory away from the hot path.
define i32 @test_load_on_cold_path_gc(i32 addrspace(1)* %p) gc "statepoint-example" personality i32 ()* @"personality_function" {
; CHECK-LABEL: @test_load_on_cold_path_gc(
; CHECK-NEXT: entry:
+; CHECK-NEXT: [[X_PRE1:%.*]] = load i32, i32 addrspace(1)* [[P:%.*]], align 4
; CHECK-NEXT: br label [[LOOP:%.*]]
; CHECK: loop:
-; CHECK-NEXT: [[IV:%.*]] = phi i32 [ 0, [[ENTRY:%.*]] ], [ [[IV_NEXT:%.*]], [[BACKEDGE:%.*]] ]
-; CHECK-NEXT: [[X:%.*]] = load i32, i32 addrspace(1)* [[P:%.*]], align 4
+; CHECK-NEXT: [[X:%.*]] = phi i32 [ [[X_PRE1]], [[ENTRY:%.*]] ], [ [[X2:%.*]], [[BACKEDGE:%.*]] ]
+; CHECK-NEXT: [[IV:%.*]] = phi i32 [ 0, [[ENTRY]] ], [ [[IV_NEXT:%.*]], [[BACKEDGE]] ]
; CHECK-NEXT: [[COND:%.*]] = icmp ne i32 [[X]], 0
; CHECK-NEXT: br i1 [[COND]], label [[HOT_PATH:%.*]], label [[COLD_PATH:%.*]]
; CHECK: hot_path:
; CHECK-NEXT: br label [[BACKEDGE]]
; CHECK: cold_path:
; CHECK-NEXT: call void @may_free_memory()
+; CHECK-NEXT: [[X_PRE:%.*]] = load i32, i32 addrspace(1)* [[P]], align 4
; CHECK-NEXT: br label [[BACKEDGE]]
; CHECK: backedge:
+; CHECK-NEXT: [[X2]] = phi i32 [ [[X_PRE]], [[COLD_PATH]] ], [ [[X]], [[HOT_PATH]] ]
; CHECK-NEXT: [[IV_NEXT]] = add i32 [[IV]], [[X]]
; CHECK-NEXT: [[LOOP_COND:%.*]] = icmp ult i32 [[IV_NEXT]], 1000
; CHECK-NEXT: br i1 [[LOOP_COND]], label [[LOOP]], label [[EXIT:%.*]]
</cut>
3 years, 10 months
- 1
- 0
Re: Buildbot failure in LLVM Buildbot on clang-armv7-quick
by Philip Reames
This bot failure appears to be unrelated to the fingered change. From
the commit log, I'd guess that 9eaf0d120 by Joel E. Denny
<jdenny.ornl(a)gmail.com> was the triggering change, but that's not in the
blame list.
Joel, FYI.
Linaro folks, as bot owner, you should investigate why the blame list is
wrong. JFYI, this is not the only bot failing with the wrong blame list,
so it might be a common problem.
Philip
On 6/25/21 10:43 AM, llvm.buildmaster(a)lab.llvm.org wrote:
> The Buildbot has detected a failed build on builder clang-armv7-quick while building llvm.
>
> Full details are available at:
> https://lab.llvm.org/buildbot#builders/171/builds/113
>
> Worker for this Build: linaro-clang-armv7-quick
> Blamelist:
> Philip Reames <listmail(a)philipreames.com>
>
> BUILD FAILED: failed 48104 expected passes 1 unexpected failures 72 expected failures Unexpected test result output SKIPPED 26089 unsupported tests (failure)
>
> Step 5 (ninja check 1) failure: 48104 expected passes 1 unexpected failures 72 expected failures Unexpected test result output SKIPPED 26089 unsupported tests (failure)
> ******************** TEST 'Clang :: utils/update_cc_test_checks/check-globals.test' FAILED ********************
> Script:
> --
> : 'RUN: at line 1'; rm -rf /home/tcwg-buildslave/worker/clang-armv7-quick/stage1/tools/clang/test/utils/update_cc_test_checks/Output/check-globals.test.tmp && mkdir /home/tcwg-buildslave/worker/clang-armv7-quick/stage1/tools/clang/test/utils/update_cc_test_checks/Output/check-globals.test.tmp
> : 'RUN: at line 5'; cp /home/tcwg-buildslave/worker/clang-armv7-quick/llvm/clang/test/utils/update_cc_test_checks/Inputs/check-globals.c /home/tcwg-buildslave/worker/clang-armv7-quick/stage1/tools/clang/test/utils/update_cc_test_checks/Output/check-globals.test.tmp/norm.c
> : 'RUN: at line 6'; /usr/bin/python3.6 /home/tcwg-buildslave/worker/clang-armv7-quick/llvm/llvm/utils/update_cc_test_checks.py --clang /home/tcwg-buildslave/worker/clang-armv7-quick/stage1/bin/clang --opt /home/tcwg-buildslave/worker/clang-armv7-quick/stage1/bin/opt /home/tcwg-buildslave/worker/clang-armv7-quick/stage1/tools/clang/test/utils/update_cc_test_checks/Output/check-globals.test.tmp/norm.c --check-globals
> : 'RUN: at line 7'; /home/tcwg-buildslave/worker/clang-armv7-quick/stage1/bin/FileCheck /home/tcwg-buildslave/worker/clang-armv7-quick/llvm/clang/test/utils/update_cc_test_checks/check-globals.test --input-file=/home/tcwg-buildslave/worker/clang-armv7-quick/stage1/tools/clang/test/utils/update_cc_test_checks/Output/check-globals.test.tmp/norm.c --match-full-lines -strict-whitespace -check-prefixes=BOTH,NRM
> : 'RUN: at line 10'; cp /home/tcwg-buildslave/worker/clang-armv7-quick/llvm/clang/test/utils/update_cc_test_checks/Inputs/check-globals.c /home/tcwg-buildslave/worker/clang-armv7-quick/stage1/tools/clang/test/utils/update_cc_test_checks/Output/check-globals.test.tmp/igf.c
> : 'RUN: at line 11'; /usr/bin/python3.6 /home/tcwg-buildslave/worker/clang-armv7-quick/llvm/llvm/utils/update_cc_test_checks.py --clang /home/tcwg-buildslave/worker/clang-armv7-quick/stage1/bin/clang --opt /home/tcwg-buildslave/worker/clang-armv7-quick/stage1/bin/opt /home/tcwg-buildslave/worker/clang-armv7-quick/stage1/tools/clang/test/utils/update_cc_test_checks/Output/check-globals.test.tmp/igf.c --check-globals --include-generated-funcs
> : 'RUN: at line 12'; /home/tcwg-buildslave/worker/clang-armv7-quick/stage1/bin/FileCheck /home/tcwg-buildslave/worker/clang-armv7-quick/llvm/clang/test/utils/update_cc_test_checks/check-globals.test --input-file=/home/tcwg-buildslave/worker/clang-armv7-quick/stage1/tools/clang/test/utils/update_cc_test_checks/Output/check-globals.test.tmp/igf.c --match-full-lines -strict-whitespace -check-prefixes=BOTH,IGF
> : 'RUN: at line 17'; cp /home/tcwg-buildslave/worker/clang-armv7-quick/stage1/tools/clang/test/utils/update_cc_test_checks/Output/check-globals.test.tmp/norm.c /home/tcwg-buildslave/worker/clang-armv7-quick/stage1/tools/clang/test/utils/update_cc_test_checks/Output/check-globals.test.tmp/norm-again.c
> : 'RUN: at line 18'; /usr/bin/python3.6 /home/tcwg-buildslave/worker/clang-armv7-quick/llvm/llvm/utils/update_cc_test_checks.py --clang /home/tcwg-buildslave/worker/clang-armv7-quick/stage1/bin/clang --opt /home/tcwg-buildslave/worker/clang-armv7-quick/stage1/bin/opt /home/tcwg-buildslave/worker/clang-armv7-quick/stage1/tools/clang/test/utils/update_cc_test_checks/Output/check-globals.test.tmp/norm-again.c --check-globals
> : 'RUN: at line 19'; diff -u /home/tcwg-buildslave/worker/clang-armv7-quick/stage1/tools/clang/test/utils/update_cc_test_checks/Output/check-globals.test.tmp/norm.c /home/tcwg-buildslave/worker/clang-armv7-quick/stage1/tools/clang/test/utils/update_cc_test_checks/Output/check-globals.test.tmp/norm-again.c
> : 'RUN: at line 20'; rm /home/tcwg-buildslave/worker/clang-armv7-quick/stage1/tools/clang/test/utils/update_cc_test_checks/Output/check-globals.test.tmp/norm-again.c
> : 'RUN: at line 22'; cp /home/tcwg-buildslave/worker/clang-armv7-quick/stage1/tools/clang/test/utils/update_cc_test_checks/Output/check-globals.test.tmp/igf.c /home/tcwg-buildslave/worker/clang-armv7-quick/stage1/tools/clang/test/utils/update_cc_test_checks/Output/check-globals.test.tmp/igf-again.c
> : 'RUN: at line 23'; /usr/bin/python3.6 /home/tcwg-buildslave/worker/clang-armv7-quick/llvm/llvm/utils/update_cc_test_checks.py --clang /home/tcwg-buildslave/worker/clang-armv7-quick/stage1/bin/clang --opt /home/tcwg-buildslave/worker/clang-armv7-quick/stage1/bin/opt /home/tcwg-buildslave/worker/clang-armv7-quick/stage1/tools/clang/test/utils/update_cc_test_checks/Output/check-globals.test.tmp/igf-again.c --check-globals --include-generated-funcs
> : 'RUN: at line 25'; diff -u /home/tcwg-buildslave/worker/clang-armv7-quick/stage1/tools/clang/test/utils/update_cc_test_checks/Output/check-globals.test.tmp/igf.c /home/tcwg-buildslave/worker/clang-armv7-quick/stage1/tools/clang/test/utils/update_cc_test_checks/Output/check-globals.test.tmp/igf-again.c
> : 'RUN: at line 26'; rm /home/tcwg-buildslave/worker/clang-armv7-quick/stage1/tools/clang/test/utils/update_cc_test_checks/Output/check-globals.test.tmp/igf-again.c
> : 'RUN: at line 31'; cp /home/tcwg-buildslave/worker/clang-armv7-quick/llvm/clang/test/utils/update_cc_test_checks/Inputs/lit.cfg.example /home/tcwg-buildslave/worker/clang-armv7-quick/stage1/tools/clang/test/utils/update_cc_test_checks/Output/check-globals.test.tmp/lit.cfg
> : 'RUN: at line 33'; /usr/bin/python3.6 /home/tcwg-buildslave/worker/clang-armv7-quick/llvm/llvm/utils/lit/lit.py -Dclang_obj_root=/home/tcwg-buildslave/worker/clang-armv7-quick/stage1/tools/clang -j1 -vv /home/tcwg-buildslave/worker/clang-armv7-quick/stage1/tools/clang/test/utils/update_cc_test_checks/Output/check-globals.test.tmp
> : 'RUN: at line 35'; /usr/bin/python3.6 /home/tcwg-buildslave/worker/clang-armv7-quick/llvm/llvm/utils/lit/lit.py -Dclang_obj_root=/home/tcwg-buildslave/worker/clang-armv7-quick/stage1/tools/clang -j1 -vv /home/tcwg-buildslave/worker/clang-armv7-quick/stage1/tools/clang/test/utils/update_cc_test_checks/Output/check-globals.test.tmp 2>&1 | /home/tcwg-buildslave/worker/clang-armv7-quick/stage1/bin/FileCheck -check-prefix=LIT-RUN /home/tcwg-buildslave/worker/clang-armv7-quick/llvm/clang/test/utils/update_cc_test_checks/check-globals.test
> --
> Exit Code: 1
>
> Command Output (stdout):
> --
> $ ":" "RUN: at line 1"
> $ "rm" "-rf" "/home/tcwg-buildslave/worker/clang-armv7-quick/stage1/tools/clang/test/utils/update_cc_test_checks/Output/check-globals.test.tmp"
> $ "mkdir" "/home/tcwg-buildslave/worker/clang-armv7-quick/stage1/tools/clang/test/utils/update_cc_test_checks/Output/check-globals.test.tmp"
> $ ":" "RUN: at line 5"
> $ "cp" "/home/tcwg-buildslave/worker/clang-armv7-quick/llvm/clang/test/utils/update_cc_test_checks/Inputs/check-globals.c" "/home/tcwg-buildslave/worker/clang-armv7-quick/stage1/tools/clang/test/utils/update_cc_test_checks/Output/check-globals.test.tmp/norm.c"
> $ ":" "RUN: at line 6"
> $ "/usr/bin/python3.6" "/home/tcwg-buildslave/worker/clang-armv7-quick/llvm/llvm/utils/update_cc_test_checks.py" "--clang" "/home/tcwg-buildslave/worker/clang-armv7-quick/stage1/bin/clang" "--opt" "/home/tcwg-buildslave/worker/clang-armv7-quick/stage1/bin/opt" "/home/tcwg-buildslave/worker/clang-armv7-quick/stage1/tools/clang/test/utils/update_cc_test_checks/Output/check-globals.test.tmp/norm.c" "--check-globals"
> # command stderr:
> NOTE: Executing non-FileChecked RUN line: true
>
> $ ":" "RUN: at line 7"
> $ "/home/tcwg-buildslave/worker/clang-armv7-quick/stage1/bin/FileCheck" "/home/tcwg-buildslave/worker/clang-armv7-quick/llvm/clang/test/utils/update_cc_test_checks/check-globals.test" "--input-file=/home/tcwg-buildslave/worker/clang-armv7-quick/stage1/tools/clang/test/utils/update_cc_test_checks/Output/check-globals.test.tmp/norm.c" "--match-full-lines" "-strict-whitespace" "-check-prefixes=BOTH,NRM"
> $ ":" "RUN: at line 10"
> $ "cp" "/home/tcwg-buildslave/worker/clang-armv7-quick/llvm/clang/test/utils/update_cc_test_checks/Inputs/check-globals.c" "/home/tcwg-buildslave/worker/clang-armv7-quick/stage1/tools/clang/test/utils/update_cc_test_checks/Output/check-globals.test.tmp/igf.c"
> $ ":" "RUN: at line 11"
> $ "/usr/bin/python3.6" "/home/tcwg-buildslave/worker/clang-armv7-quick/llvm/llvm/utils/update_cc_test_checks.py" "--clang" "/home/tcwg-buildslave/worker/clang-armv7-quick/stage1/bin/clang" "--opt" "/home/tcwg-buildslave/worker/clang-armv7-quick/stage1/bin/opt" "/home/tcwg-buildslave/worker/clang-armv7-quick/stage1/tools/clang/test/utils/update_cc_test_checks/Output/check-globals.test.tmp/igf.c" "--check-globals" "--include-generated-funcs"
> # command stderr:
> NOTE: Executing non-FileChecked RUN line: true
>
> $ ":" "RUN: at line 12"
> $ "/home/tcwg-buildslave/worker/clang-armv7-quick/stage1/bin/FileCheck" "/home/tcwg-buildslave/worker/clang-armv7-quick/llvm/clang/test/utils/update_cc_test_checks/check-globals.test" "--input-file=/home/tcwg-buildslave/worker/clang-armv7-quick/stage1/tools/clang/test/utils/update_cc_test_checks/Output/check-globals.test.tmp/igf.c" "--match-full-lines" "-strict-whitespace" "-check-prefixes=BOTH,IGF"
> $ ":" "RUN: at line 17"
> $ "cp" "/home/tcwg-buildslave/worker/clang-armv7-quick/stage1/tools/clang/test/utils/update_cc_test_checks/Output/check-globals.test.tmp/norm.c" "/home/tcwg-buildslave/worker/clang-armv7-quick/stage1/tools/clang/test/utils/update_cc_test_checks/Output/check-globals.test.tmp/norm-again.c"
> $ ":" "RUN: at line 18"
> ...
>
> Sincerely,
> LLVM Buildbot
>
3 years, 10 months
- 3
- 2
Re: [CI-NOTIFY]: TCWG Bisect tcwg_bmk_tk1/gnu-release-arm-spec2k6-Os_LTO - Build # 31 - Fixed!
by Maxim Kuvyrkov
I’m running historical performance experiments, and this commit from 2019 showed up on my radar. Just in case someone is interested in running Fortran code on memory-constrained M-profile cores ...
It appears that Janne’s patch increases code-size of 437.leslie3d by around 2% on 32-bit ARM (well, Thumb2, to be precise). It may be interesting to check what’s going on, since AArch64 is not affected.
One possibility is that before this patch all literal-pool entries for error messages were shared, and with variation of error messages all of them became different entries, thus increasing code size.
--
Maxim Kuvyrkov
https://www.linaro.org
> On 28 Jun 2021, at 00:54, ci_notify(a)linaro.org wrote:
>
> Successfully identified regression in *gcc* in CI configuration tcwg_bmk_gnu_tk1/gnu-release-arm-spec2k6-Os_LTO. So far, this commit has regressed CI configurations:
> - tcwg_bmk_gnu_tk1/gnu-release-arm-spec2k6-Os_LTO
> - tcwg_bmk_tk1/gnu-release-arm-spec2k6-Os
>
> Culprit:
> <cut>
> commit d74a8b0579edd0c42921eccc45ab986d24f2fef0
> Author: Janne Blomqvist <jb(a)gcc.gnu.org>
>
> PR fortran/68401 Improve allocation error message
> </cut>
>
> Results regressed to (for first_bad == d74a8b0579edd0c42921eccc45ab986d24f2fef0)
> # reset_artifacts:
> -10
> # build_abe binutils:
> -9
> # build_abe stage1 -- --set gcc_override_configure=--with-mode=thumb --set gcc_override_configure=--disable-libsanitizer:
> -8
> # build_abe linux:
> -7
> # build_abe glibc:
> -6
> # build_abe stage2 -- --set gcc_override_configure=--with-mode=thumb --set gcc_override_configure=--disable-libsanitizer:
> -5
> # true:
> 0
> # benchmark -Os_LTO_mthumb -- artifacts/build-d74a8b0579edd0c42921eccc45ab986d24f2fef0/results_id:
> 1
> # 437.leslie3d,leslie3d_base.default regressed by 102
>
> from (for last_good == 777c02825229f14cf91c6044827ea42a77ded4a3)
> # reset_artifacts:
> -10
> # build_abe binutils:
> -9
> # build_abe stage1 -- --set gcc_override_configure=--with-mode=thumb --set gcc_override_configure=--disable-libsanitizer:
> -8
> # build_abe linux:
> -7
> # build_abe glibc:
> -6
> # build_abe stage2 -- --set gcc_override_configure=--with-mode=thumb --set gcc_override_configure=--disable-libsanitizer:
> -5
> # true:
> 0
> # benchmark -Os_LTO_mthumb -- artifacts/build-777c02825229f14cf91c6044827ea42a77ded4a3/results_id:
> 1
>
> Artifacts of last_good build: https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tk1-gnu-release-a…
> Results ID of last_good: tk1_32/tcwg_bmk_gnu_tk1/bisect-gnu-release-arm-spec2k6-Os_LTO/531
> Artifacts of first_bad build: https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tk1-gnu-release-a…
> Results ID of first_bad: tk1_32/tcwg_bmk_gnu_tk1/bisect-gnu-release-arm-spec2k6-Os_LTO/539
> Build top page/logs: https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tk1-gnu-release-a…
>
> Configuration details:
>
>
> Reproduce builds:
> <cut>
> mkdir investigate-gcc-d74a8b0579edd0c42921eccc45ab986d24f2fef0
> cd investigate-gcc-d74a8b0579edd0c42921eccc45ab986d24f2fef0
>
> git clone https://git.linaro.org/toolchain/jenkins-scripts
>
> mkdir -p artifacts/manifests
> curl -o artifacts/manifests/build-baseline.sh https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tk1-gnu-release-a… --fail
> curl -o artifacts/manifests/build-parameters.sh https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tk1-gnu-release-a… --fail
> curl -o artifacts/test.sh https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tk1-gnu-release-a… --fail
> chmod +x artifacts/test.sh
>
> # Reproduce the baseline build (build all pre-requisites)
> ./jenkins-scripts/tcwg_bmk-build.sh @@ artifacts/manifests/build-baseline.sh
>
> cd gcc
>
> # Reproduce first_bad build
> git checkout --detach d74a8b0579edd0c42921eccc45ab986d24f2fef0
> ../artifacts/test.sh
>
> # Reproduce last_good build
> git checkout --detach 777c02825229f14cf91c6044827ea42a77ded4a3
> ../artifacts/test.sh
>
> cd ..
> </cut>
>
> History of pending regressions and results: https://git.linaro.org/toolchain/ci/base-artifacts.git/log/?h=linaro-local/…
>
> Artifacts: https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tk1-gnu-release-a…
> Build log: https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tk1-gnu-release-a…
>
> Full commit (up to 1000 lines):
> <cut>
> commit d74a8b0579edd0c42921eccc45ab986d24f2fef0
> Author: Janne Blomqvist <jb(a)gcc.gnu.org>
> Date: Sat Aug 17 08:45:37 2019 +0300
>
> PR fortran/68401 Improve allocation error message
>
> Improve the error message that is printed when a memory allocation
> fails, by including the location, and the size of the allocation that
> failed.
>
> Regtested on x86_64-pc-linux-gnu.
>
> gcc/fortran/ChangeLog:
>
> 2019-08-17 Janne Blomqvist <jb(a)gcc.gnu.org>
>
> PR fortran/68401
> * trans-decl.c (gfc_build_builtin_function_decls): Replace
> os_error with os_error_at decl.
> * trans.c (trans_runtime_error_vararg): Modify so the error
> function decl is passed directly.
> (gfc_trans_runtime_error): Pass correct error function decl.
> (gfc_trans_runtime_check): Likewise.
> (trans_os_error_at): New function.
> (gfc_call_malloc): Use trans_os_error_at.
> (gfc_allocate_using_malloc): Likewise.
> (gfc_call_realloc): Likewise.
> * trans.h (gfor_fndecl_os_error): Replace with gfor_fndecl_os_error_at.
>
> libgfortran/ChangeLog:
>
> 2019-08-17 Janne Blomqvist <jb(a)gcc.gnu.org>
>
> PR fortran/68401
> * gfortran.map: Add GFORTRAN_10 node, add _gfortran_os_error_at
> symbol.
> * libgfortran.h (os_error_at): New prototype.
> * runtime/error.c (os_error_at): New function.
>
> From-SVN: r274599
> ---
> gcc/fortran/ChangeLog | 17 +++++++++++-
> gcc/fortran/trans-decl.c | 12 ++++----
> gcc/fortran/trans.c | 68 +++++++++++++++++++++++++++------------------
> gcc/fortran/trans.h | 2 +-
> libgfortran/ChangeLog | 8 ++++++
> libgfortran/gfortran.map | 5 ++++
> libgfortran/libgfortran.h | 4 +++
> libgfortran/runtime/error.c | 46 +++++++++++++++++++++++++++++-
> 8 files changed, 126 insertions(+), 36 deletions(-)
>
> diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
> index bab69f3000e..a3b9e6bf486 100644
> --- a/gcc/fortran/ChangeLog
> +++ b/gcc/fortran/ChangeLog
> @@ -1,3 +1,18 @@
> +2019-08-17 Janne Blomqvist <jb(a)gcc.gnu.org>
> +
> + PR fortran/68401
> + * trans-decl.c (gfc_build_builtin_function_decls): Replace
> + os_error with os_error_at decl.
> + * trans.c (trans_runtime_error_vararg): Modify so the error
> + function decl is passed directly.
> + (gfc_trans_runtime_error): Pass correct error function decl.
> + (gfc_trans_runtime_check): Likewise.
> + (trans_os_error_at): New function.
> + (gfc_call_malloc): Use trans_os_error_at.
> + (gfc_allocate_using_malloc): Likewise.
> + (gfc_call_realloc): Likewise.
> + * trans.h (gfor_fndecl_os_error): Replace with gfor_fndecl_os_error_at.
> +
> 2019-08-16 Jeff Law <law(a)redhat.com>
> Mark Eggleston <mark.eggleston(a)codethink.com>
>
> @@ -18,7 +33,7 @@
> * trans-common.c (find_equivalence) : New local variable dummy_symbol,
> accumulated equivalence attributes from each symbol then check for
> conflicts.
> -
> +
> 2019-08-16 Richard Biener <rguenther(a)suse.de>
>
> * trans-intrinsic.c (gfc_conv_intrinsic_findloc): Initialize
> diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c
> index 2a9b852568a..3c6ab60e9b2 100644
> --- a/gcc/fortran/trans-decl.c
> +++ b/gcc/fortran/trans-decl.c
> @@ -102,7 +102,7 @@ tree gfor_fndecl_error_stop_string;
> tree gfor_fndecl_runtime_error;
> tree gfor_fndecl_runtime_error_at;
> tree gfor_fndecl_runtime_warning_at;
> -tree gfor_fndecl_os_error;
> +tree gfor_fndecl_os_error_at;
> tree gfor_fndecl_generate_error;
> tree gfor_fndecl_set_args;
> tree gfor_fndecl_set_fpe;
> @@ -3679,11 +3679,11 @@ gfc_build_builtin_function_decls (void)
> void_type_node, 3, pvoid_type_node, integer_type_node,
> pchar_type_node);
>
> - gfor_fndecl_os_error = gfc_build_library_function_decl_with_spec (
> - get_identifier (PREFIX("os_error")), ".R",
> - void_type_node, 1, pchar_type_node);
> - /* The runtime_error function does not return. */
> - TREE_THIS_VOLATILE (gfor_fndecl_os_error) = 1;
> + gfor_fndecl_os_error_at = gfc_build_library_function_decl_with_spec (
> + get_identifier (PREFIX("os_error_at")), ".RR",
> + void_type_node, -2, pchar_type_node, pchar_type_node);
> + /* The os_error_at function does not return. */
> + TREE_THIS_VOLATILE (gfor_fndecl_os_error_at) = 1;
>
> gfor_fndecl_set_args = gfc_build_library_function_decl (
> get_identifier (PREFIX("set_args")),
> diff --git a/gcc/fortran/trans.c b/gcc/fortran/trans.c
> index 84511477b39..583f6e3b25b 100644
> --- a/gcc/fortran/trans.c
> +++ b/gcc/fortran/trans.c
> @@ -447,7 +447,7 @@ gfc_build_array_ref (tree base, tree offset, tree decl, tree vptr)
> arguments and a locus. */
>
> static tree
> -trans_runtime_error_vararg (bool error, locus* where, const char* msgid,
> +trans_runtime_error_vararg (tree errorfunc, locus* where, const char* msgid,
> va_list ap)
> {
> stmtblock_t block;
> @@ -501,18 +501,13 @@ trans_runtime_error_vararg (bool error, locus* where, const char* msgid,
> /* Build the function call to runtime_(warning,error)_at; because of the
> variable number of arguments, we can't use build_call_expr_loc dinput_location,
> irectly. */
> - if (error)
> - fntype = TREE_TYPE (gfor_fndecl_runtime_error_at);
> - else
> - fntype = TREE_TYPE (gfor_fndecl_runtime_warning_at);
> + fntype = TREE_TYPE (errorfunc);
>
> loc = where ? where->lb->location : input_location;
> tmp = fold_build_call_array_loc (loc, TREE_TYPE (fntype),
> fold_build1_loc (loc, ADDR_EXPR,
> build_pointer_type (fntype),
> - error
> - ? gfor_fndecl_runtime_error_at
> - : gfor_fndecl_runtime_warning_at),
> + errorfunc),
> nargs + 2, argarray);
> gfc_add_expr_to_block (&block, tmp);
>
> @@ -527,7 +522,10 @@ gfc_trans_runtime_error (bool error, locus* where, const char* msgid, ...)
> tree result;
>
> va_start (ap, msgid);
> - result = trans_runtime_error_vararg (error, where, msgid, ap);
> + result = trans_runtime_error_vararg (error
> + ? gfor_fndecl_runtime_error_at
> + : gfor_fndecl_runtime_warning_at,
> + where, msgid, ap);
> va_end (ap);
> return result;
> }
> @@ -566,8 +564,10 @@ gfc_trans_runtime_check (bool error, bool once, tree cond, stmtblock_t * pblock,
> /* The code to generate the error. */
> va_start (ap, msgid);
> gfc_add_expr_to_block (&block,
> - trans_runtime_error_vararg (error, where,
> - msgid, ap));
> + trans_runtime_error_vararg
> + (error ? gfor_fndecl_runtime_error_at
> + : gfor_fndecl_runtime_warning_at,
> + where, msgid, ap));
> va_end (ap);
>
> if (once)
> @@ -595,13 +595,28 @@ gfc_trans_runtime_check (bool error, bool once, tree cond, stmtblock_t * pblock,
> }
>
>
> +static tree
> +trans_os_error_at (locus* where, const char* msgid, ...)
> +{
> + va_list ap;
> + tree result;
> +
> + va_start (ap, msgid);
> + result = trans_runtime_error_vararg (gfor_fndecl_os_error_at,
> + where, msgid, ap);
> + va_end (ap);
> + return result;
> +}
> +
> +
> +
> /* Call malloc to allocate size bytes of memory, with special conditions:
> + if size == 0, return a malloced area of size 1,
> + if malloc returns NULL, issue a runtime error. */
> tree
> gfc_call_malloc (stmtblock_t * block, tree type, tree size)
> {
> - tree tmp, msg, malloc_result, null_result, res, malloc_tree;
> + tree tmp, malloc_result, null_result, res, malloc_tree;
> stmtblock_t block2;
>
> /* Create a variable to hold the result. */
> @@ -626,13 +641,14 @@ gfc_call_malloc (stmtblock_t * block, tree type, tree size)
> null_result = fold_build2_loc (input_location, EQ_EXPR,
> logical_type_node, res,
> build_int_cst (pvoid_type_node, 0));
> - msg = gfc_build_addr_expr (pchar_type_node,
> - gfc_build_localized_cstring_const ("Memory allocation failed"));
> tmp = fold_build3_loc (input_location, COND_EXPR, void_type_node,
> null_result,
> - build_call_expr_loc (input_location,
> - gfor_fndecl_os_error, 1, msg),
> - build_empty_stmt (input_location));
> + trans_os_error_at (NULL,
> + "Error allocating %lu bytes",
> + fold_convert
> + (long_unsigned_type_node,
> + size)),
> + build_empty_stmt (input_location));
> gfc_add_expr_to_block (&block2, tmp);
> }
>
> @@ -701,11 +717,9 @@ gfc_allocate_using_malloc (stmtblock_t * block, tree pointer,
> }
> else
> {
> - /* Here, os_error already implies PRED_NORETURN. */
> - tmp = build_call_expr_loc (input_location, gfor_fndecl_os_error, 1,
> - gfc_build_addr_expr (pchar_type_node,
> - gfc_build_localized_cstring_const
> - ("Allocation would exceed memory limit")));
> + /* Here, os_error_at already implies PRED_NORETURN. */
> + tree lusize = fold_convert (long_unsigned_type_node, size);
> + tmp = trans_os_error_at (NULL, "Error allocating %lu bytes", lusize);
> gfc_add_expr_to_block (&on_error, tmp);
> }
>
> @@ -1664,7 +1678,7 @@ internal_realloc (void *mem, size_t size)
> tree
> gfc_call_realloc (stmtblock_t * block, tree mem, tree size)
> {
> - tree msg, res, nonzero, null_result, tmp;
> + tree res, nonzero, null_result, tmp;
> tree type = TREE_TYPE (mem);
>
> /* Only evaluate the size once. */
> @@ -1684,12 +1698,12 @@ gfc_call_realloc (stmtblock_t * block, tree mem, tree size)
> build_int_cst (size_type_node, 0));
> null_result = fold_build2_loc (input_location, TRUTH_AND_EXPR, logical_type_node,
> null_result, nonzero);
> - msg = gfc_build_addr_expr (pchar_type_node, gfc_build_localized_cstring_const
> - ("Allocation would exceed memory limit"));
> tmp = fold_build3_loc (input_location, COND_EXPR, void_type_node,
> null_result,
> - build_call_expr_loc (input_location,
> - gfor_fndecl_os_error, 1, msg),
> + trans_os_error_at (NULL,
> + "Error reallocating to %lu bytes",
> + fold_convert
> + (long_unsigned_type_node, size)),
> build_empty_stmt (input_location));
> gfc_add_expr_to_block (block, tmp);
>
> diff --git a/gcc/fortran/trans.h b/gcc/fortran/trans.h
> index a3726e84140..8082b414df1 100644
> --- a/gcc/fortran/trans.h
> +++ b/gcc/fortran/trans.h
> @@ -803,7 +803,7 @@ extern GTY(()) tree gfor_fndecl_error_stop_string;
> extern GTY(()) tree gfor_fndecl_runtime_error;
> extern GTY(()) tree gfor_fndecl_runtime_error_at;
> extern GTY(()) tree gfor_fndecl_runtime_warning_at;
> -extern GTY(()) tree gfor_fndecl_os_error;
> +extern GTY(()) tree gfor_fndecl_os_error_at;
> extern GTY(()) tree gfor_fndecl_generate_error;
> extern GTY(()) tree gfor_fndecl_set_fpe;
> extern GTY(()) tree gfor_fndecl_set_options;
> diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
> index 7a11ca29fd3..23a4c579351 100644
> --- a/libgfortran/ChangeLog
> +++ b/libgfortran/ChangeLog
> @@ -1,3 +1,11 @@
> +2019-08-17 Janne Blomqvist <jb(a)gcc.gnu.org>
> +
> + PR fortran/68401
> + * gfortran.map: Add GFORTRAN_10 node, add _gfortran_os_error_at
> + symbol.
> + * libgfortran.h (os_error_at): New prototype.
> + * runtime/error.c (os_error_at): New function.
> +
> 2019-08-13 Janne Blomqvist <jb(a)gcc.gnu.org>
>
> PR fortran/91414
> diff --git a/libgfortran/gfortran.map b/libgfortran/gfortran.map
> index 2b2243b4fd4..3601bc24414 100644
> --- a/libgfortran/gfortran.map
> +++ b/libgfortran/gfortran.map
> @@ -1602,3 +1602,8 @@ GFORTRAN_9.2 {
> _gfortran_mfindloc1_r10;
> _gfortran_sfindloc1_r10;
> } GFORTRAN_9;
> +
> +GFORTRAN_10 {
> + global:
> + _gfortran_os_error_at;
> +} GFORTRAN_9.2;
> diff --git a/libgfortran/libgfortran.h b/libgfortran/libgfortran.h
> index c0db96f02a8..9f535b12e73 100644
> --- a/libgfortran/libgfortran.h
> +++ b/libgfortran/libgfortran.h
> @@ -728,6 +728,10 @@ internal_proto(gfc_xtoa);
> extern _Noreturn void os_error (const char *);
> iexport_proto(os_error);
>
> +extern _Noreturn void os_error_at (const char *, const char *, ...)
> + __attribute__ ((format (gfc_printf, 2, 3)));
> +iexport_proto(os_error_at);
> +
> extern void show_locus (st_parameter_common *);
> internal_proto(show_locus);
>
> diff --git a/libgfortran/runtime/error.c b/libgfortran/runtime/error.c
> index 0335a165edc..cbe0642f3f8 100644
> --- a/libgfortran/runtime/error.c
> +++ b/libgfortran/runtime/error.c
> @@ -403,7 +403,51 @@ os_error (const char *message)
> estr_writev (iov, 5);
> exit_error (1);
> }
> -iexport(os_error);
> +iexport(os_error); /* TODO, DEPRECATED, ABI: Should not be exported
> + anymore when bumping so version. */
> +
> +
> +/* Improved version of os_error with a printf style format string and
> + a locus. */
> +
> +void
> +os_error_at (const char *where, const char *message, ...)
> +{
> + char errmsg[STRERR_MAXSZ];
> + char buffer[STRERR_MAXSZ];
> + struct iovec iov[6];
> + va_list ap;
> + recursion_check ();
> + int written;
> +
> + iov[0].iov_base = (char*) where;
> + iov[0].iov_len = strlen (where);
> +
> + iov[1].iov_base = (char*) ": ";
> + iov[1].iov_len = strlen (iov[1].iov_base);
> +
> + va_start (ap, message);
> + written = vsnprintf (buffer, STRERR_MAXSZ, message, ap);
> + va_end (ap);
> + iov[2].iov_base = buffer;
> + if (written >= 0)
> + iov[2].iov_len = written;
> + else
> + iov[2].iov_len = 0;
> +
> + iov[3].iov_base = (char*) ": ";
> + iov[3].iov_len = strlen (iov[3].iov_base);
> +
> + iov[4].iov_base = gf_strerror (errno, errmsg, STRERR_MAXSZ);
> + iov[4].iov_len = strlen (iov[4].iov_base);
> +
> + iov[5].iov_base = (char*) "\n";
> + iov[5].iov_len = 1;
> +
> + estr_writev (iov, 6);
> + exit_error (1);
> +}
> +iexport(os_error_at);
>
>
> /* void runtime_error()-- These are errors associated with an
> </cut>
3 years, 10 months
- 1
- 0
[CI-NOTIFY]: TCWG Bisect tcwg_bmk_tk1/gnu-master-arm-spec2k6-O2_LTO - Build # 31 - Successful!
by ci_notify＠linaro.org
Successfully identified regression in *gcc* in CI configuration tcwg_bmk_gnu_tk1/gnu-master-arm-spec2k6-O2_LTO. So far, this commit has regressed CI configurations:
- tcwg_bmk_gnu_tk1/gnu-master-arm-spec2k6-O2_LTO
Culprit:
<cut>
commit 32955416d8040b1fa1ba21cd4179b3264e6c5bd6
Author: Richard Biener <rguenther(a)suse.de>
Date: Mon May 3 12:07:58 2021 +0200
Improve PHI handling in DSE
This improves handling of PHI defs when walking uses in
dse_classify_store to track two PHI defs. This happens
when there are CFG merges and one PHI feeds into another.
If we decide to want more then using a sbitmap for this might be
the way to go.
2021-05-03 Richard Biener <rguenther(a)suse.de>
* tree-ssa-dse.c (dse_classify_store): Track two PHI defs.
* gcc.dg/tree-ssa/ssa-dse-42.c: New testcase.
* gcc.dg/pr81192.c: Disable DSE.
</cut>
Results regressed to (for first_bad == 32955416d8040b1fa1ba21cd4179b3264e6c5bd6)
# reset_artifacts:
-10
# build_abe binutils:
-9
# build_abe stage1 -- --set gcc_override_configure=--with-mode=arm --set gcc_override_configure=--disable-libsanitizer:
-8
# build_abe linux:
-7
# build_abe glibc:
-6
# build_abe stage2 -- --set gcc_override_configure=--with-mode=arm --set gcc_override_configure=--disable-libsanitizer:
-5
# true:
0
# benchmark -O2_LTO_marm -- artifacts/build-32955416d8040b1fa1ba21cd4179b3264e6c5bd6/results_id:
1
# 483.xalancbmk,Xalan_base.default regressed by 103
from (for last_good == ed3c43224cc4e378dbab066122bc63536ccb1276)
# reset_artifacts:
-10
# build_abe binutils:
-9
# build_abe stage1 -- --set gcc_override_configure=--with-mode=arm --set gcc_override_configure=--disable-libsanitizer:
-8
# build_abe linux:
-7
# build_abe glibc:
-6
# build_abe stage2 -- --set gcc_override_configure=--with-mode=arm --set gcc_override_configure=--disable-libsanitizer:
-5
# true:
0
# benchmark -O2_LTO_marm -- artifacts/build-ed3c43224cc4e378dbab066122bc63536ccb1276/results_id:
1
Artifacts of last_good build: https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tk1-gnu-master-ar…
Results ID of last_good: tk1_32/tcwg_bmk_gnu_tk1/bisect-gnu-master-arm-spec2k6-O2_LTO/458
Artifacts of first_bad build: https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tk1-gnu-master-ar…
Results ID of first_bad: tk1_32/tcwg_bmk_gnu_tk1/bisect-gnu-master-arm-spec2k6-O2_LTO/480
Build top page/logs: https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tk1-gnu-master-ar…
Configuration details:
Reproduce builds:
<cut>
mkdir investigate-gcc-32955416d8040b1fa1ba21cd4179b3264e6c5bd6
cd investigate-gcc-32955416d8040b1fa1ba21cd4179b3264e6c5bd6
git clone https://git.linaro.org/toolchain/jenkins-scripts
mkdir -p artifacts/manifests
curl -o artifacts/manifests/build-baseline.sh https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tk1-gnu-master-ar… --fail
curl -o artifacts/manifests/build-parameters.sh https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tk1-gnu-master-ar… --fail
curl -o artifacts/test.sh https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tk1-gnu-master-ar… --fail
chmod +x artifacts/test.sh
# Reproduce the baseline build (build all pre-requisites)
./jenkins-scripts/tcwg_bmk-build.sh @@ artifacts/manifests/build-baseline.sh
cd gcc
# Reproduce first_bad build
git checkout --detach 32955416d8040b1fa1ba21cd4179b3264e6c5bd6
../artifacts/test.sh
# Reproduce last_good build
git checkout --detach ed3c43224cc4e378dbab066122bc63536ccb1276
../artifacts/test.sh
cd ..
</cut>
History of pending regressions and results: https://git.linaro.org/toolchain/ci/base-artifacts.git/log/?h=linaro-local/…
Artifacts: https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tk1-gnu-master-ar…
Build log: https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tk1-gnu-master-ar…
Full commit (up to 1000 lines):
<cut>
commit 32955416d8040b1fa1ba21cd4179b3264e6c5bd6
Author: Richard Biener <rguenther(a)suse.de>
Date: Mon May 3 12:07:58 2021 +0200
Improve PHI handling in DSE
This improves handling of PHI defs when walking uses in
dse_classify_store to track two PHI defs. This happens
when there are CFG merges and one PHI feeds into another.
If we decide to want more then using a sbitmap for this might be
the way to go.
2021-05-03 Richard Biener <rguenther(a)suse.de>
* tree-ssa-dse.c (dse_classify_store): Track two PHI defs.
* gcc.dg/tree-ssa/ssa-dse-42.c: New testcase.
* gcc.dg/pr81192.c: Disable DSE.
---
gcc/testsuite/gcc.dg/pr81192.c | 4 +++-
gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-42.c | 20 ++++++++++++++++++++
gcc/tree-ssa-dse.c | 23 ++++++++++++++---------
3 files changed, 37 insertions(+), 10 deletions(-)
diff --git a/gcc/testsuite/gcc.dg/pr81192.c b/gcc/testsuite/gcc.dg/pr81192.c
index 71bbc13a0e9..6cab6056558 100644
--- a/gcc/testsuite/gcc.dg/pr81192.c
+++ b/gcc/testsuite/gcc.dg/pr81192.c
@@ -1,4 +1,4 @@
-/* { dg-options "-Os -fdump-tree-pre-details -fdisable-tree-evrp" } */
+/* { dg-options "-Os -fdump-tree-pre-details -fdisable-tree-evrp -fno-tree-dse" } */
/* Disable tree-evrp because the new version of evrp sees
<bb 3> :
@@ -16,6 +16,8 @@ produces
# iftmp.2_12 = PHI <2147483647(3), iftmp.2_11(4)>
which causes the situation being tested to dissapear before we get to PRE. */
+/* Likewise disable DSE which also elides the tail merging "opportunity". */
+
#if __SIZEOF_INT__ == 2
#define unsigned __UINT32_TYPE__
#define int __INT32_TYPE__
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-42.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-42.c
new file mode 100644
index 00000000000..34108c83828
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-42.c
@@ -0,0 +1,20 @@
+/* { dg-do compile } */
+/* { dg-options "-O -fdump-tree-dse1" } */
+
+int a[2];
+void foo(int i, int k, int j)
+{
+ a[0] = i;
+ if (k)
+ a[0] = a[i] + k;
+ else
+ {
+ if (j)
+ a[1] = 1;
+ a[0] = a[i] + 3;
+ }
+ a[0] = 0;
+}
+
+/* The last stores to a[0] and a[1] remain. */
+/* { dg-final { scan-tree-dump-times " = " 2 "dse1" } } */
diff --git a/gcc/tree-ssa-dse.c b/gcc/tree-ssa-dse.c
index e0a944c704a..dfa6d314727 100644
--- a/gcc/tree-ssa-dse.c
+++ b/gcc/tree-ssa-dse.c
@@ -799,7 +799,8 @@ dse_classify_store (ao_ref *ref, gimple *stmt,
return DSE_STORE_LIVE;
auto_vec<gimple *, 10> defs;
- gimple *phi_def = NULL;
+ gimple *first_phi_def = NULL;
+ gimple *last_phi_def = NULL;
FOR_EACH_IMM_USE_STMT (use_stmt, ui, defvar)
{
/* Limit stmt walking. */
@@ -825,7 +826,9 @@ dse_classify_store (ao_ref *ref, gimple *stmt,
SSA_NAME_VERSION (PHI_RESULT (use_stmt))))
{
defs.safe_push (use_stmt);
- phi_def = use_stmt;
+ if (!first_phi_def)
+ first_phi_def = use_stmt;
+ last_phi_def = use_stmt;
}
}
/* If the statement is a use the store is not dead. */
@@ -889,6 +892,8 @@ dse_classify_store (ao_ref *ref, gimple *stmt,
gimple *def = defs[i];
gimple *use_stmt;
use_operand_p use_p;
+ tree vdef = (gimple_code (def) == GIMPLE_PHI
+ ? gimple_phi_result (def) : gimple_vdef (def));
/* If the path to check starts with a kill we do not need to
process it further.
??? With byte tracking we need only kill the bytes currently
@@ -901,8 +906,7 @@ dse_classify_store (ao_ref *ref, gimple *stmt,
}
/* If the path ends here we do not need to process it further.
This for example happens with calls to noreturn functions. */
- else if (gimple_code (def) != GIMPLE_PHI
- && has_zero_uses (gimple_vdef (def)))
+ else if (has_zero_uses (vdef))
{
/* But if the store is to global memory it is definitely
not dead. */
@@ -912,12 +916,13 @@ dse_classify_store (ao_ref *ref, gimple *stmt,
}
/* In addition to kills we can remove defs whose only use
is another def in defs. That can only ever be PHIs of which
- we track a single for simplicity reasons (we fail for multiple
- PHIs anyways). We can also ignore defs that feed only into
+ we track two for simplicity reasons, the first and last in
+ {first,last}_phi_def (we fail for multiple PHIs anyways).
+ We can also ignore defs that feed only into
already visited PHIs. */
- else if (gimple_code (def) != GIMPLE_PHI
- && single_imm_use (gimple_vdef (def), &use_p, &use_stmt)
- && (use_stmt == phi_def
+ else if (single_imm_use (vdef, &use_p, &use_stmt)
+ && (use_stmt == first_phi_def
+ || use_stmt == last_phi_def
|| (gimple_code (use_stmt) == GIMPLE_PHI
&& bitmap_bit_p (visited,
SSA_NAME_VERSION
</cut>
3 years, 10 months
- 3
- 2
[ACTIVITY] 14 - 25 June 2021
by Prathamesh Kulkarni
== This Week ==
* PR97906 (missed lowering to vac)
- Committed patch.
* PR66791 (replace builtins with vector extensions in neon intrinsics):
- Committed patch for vceq
- Submitted patch for vca
- Submitted patch for vdup
* PR98435 (missed opt in expanding vector constructor)
- Patch conditionally approved by Kyrill
== Next Week ==
- PR98435: Address changes and commit the fix.
- PR66791: Continue with intrinsics.
3 years, 10 months
- 1
- 0
[CI-NOTIFY]: TCWG Bisect tcwg_bmk_tx1/gnu-master-aarch64-spec2k6-O2 - Build # 21 - Successful!
by ci_notify＠linaro.org
Successfully identified regression in *gcc* in CI configuration tcwg_bmk_gnu_tx1/gnu-master-aarch64-spec2k6-O2. So far, this commit has regressed CI configurations:
- tcwg_bmk_gnu_tx1/gnu-master-aarch64-spec2k6-O2
Culprit:
<cut>
commit 87a7d10c2e9ec34a276e6acb5d2282a35b9cfafb
Author: GCC Administrator <gccadmin(a)gcc.gnu.org>
Date: Sat May 15 00:16:27 2021 +0000
Daily bump.
</cut>
Results regressed to (for first_bad == 87a7d10c2e9ec34a276e6acb5d2282a35b9cfafb)
# reset_artifacts:
-10
# build_abe binutils:
-9
# build_abe stage1 -- --set gcc_override_configure=--disable-libsanitizer:
-8
# build_abe linux:
-7
# build_abe glibc:
-6
# build_abe stage2 -- --set gcc_override_configure=--disable-libsanitizer:
-5
# true:
0
# benchmark -O2 -- artifacts/build-87a7d10c2e9ec34a276e6acb5d2282a35b9cfafb/results_id:
1
# 459.GemsFDTD,GemsFDTD_base.default regressed by 103
from (for last_good == 0e3702f8daeec5897982d185650b78a5c1c53c25)
# reset_artifacts:
-10
# build_abe binutils:
-9
# build_abe stage1 -- --set gcc_override_configure=--disable-libsanitizer:
-8
# build_abe linux:
-7
# build_abe glibc:
-6
# build_abe stage2 -- --set gcc_override_configure=--disable-libsanitizer:
-5
# true:
0
# benchmark -O2 -- artifacts/build-0e3702f8daeec5897982d185650b78a5c1c53c25/results_id:
1
Artifacts of last_good build: https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tx1-gnu-master-aa…
Results ID of last_good: tx1_64/tcwg_bmk_gnu_tx1/bisect-gnu-master-aarch64-spec2k6-O2/533
Artifacts of first_bad build: https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tx1-gnu-master-aa…
Results ID of first_bad: tx1_64/tcwg_bmk_gnu_tx1/bisect-gnu-master-aarch64-spec2k6-O2/530
Build top page/logs: https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tx1-gnu-master-aa…
Configuration details:
Reproduce builds:
<cut>
mkdir investigate-gcc-87a7d10c2e9ec34a276e6acb5d2282a35b9cfafb
cd investigate-gcc-87a7d10c2e9ec34a276e6acb5d2282a35b9cfafb
git clone https://git.linaro.org/toolchain/jenkins-scripts
mkdir -p artifacts/manifests
curl -o artifacts/manifests/build-baseline.sh https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tx1-gnu-master-aa… --fail
curl -o artifacts/manifests/build-parameters.sh https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tx1-gnu-master-aa… --fail
curl -o artifacts/test.sh https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tx1-gnu-master-aa… --fail
chmod +x artifacts/test.sh
# Reproduce the baseline build (build all pre-requisites)
./jenkins-scripts/tcwg_bmk-build.sh @@ artifacts/manifests/build-baseline.sh
cd gcc
# Reproduce first_bad build
git checkout --detach 87a7d10c2e9ec34a276e6acb5d2282a35b9cfafb
../artifacts/test.sh
# Reproduce last_good build
git checkout --detach 0e3702f8daeec5897982d185650b78a5c1c53c25
../artifacts/test.sh
cd ..
</cut>
History of pending regressions and results: https://git.linaro.org/toolchain/ci/base-artifacts.git/log/?h=linaro-local/…
Artifacts: https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tx1-gnu-master-aa…
Build log: https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tx1-gnu-master-aa…
Full commit (up to 1000 lines):
<cut>
commit 87a7d10c2e9ec34a276e6acb5d2282a35b9cfafb
Author: GCC Administrator <gccadmin(a)gcc.gnu.org>
Date: Sat May 15 00:16:27 2021 +0000
Daily bump.
---
contrib/ChangeLog | 14 +++++++++++
gcc/ChangeLog | 55 ++++++++++++++++++++++++++++++++++++++++++++
gcc/DATESTAMP | 2 +-
gcc/ada/ChangeLog | 6 +++++
gcc/c-family/ChangeLog | 4 ++++
gcc/cp/ChangeLog | 21 +++++++++++++++++
gcc/fortran/ChangeLog | 25 ++++++++++++++++++++
gcc/testsuite/ChangeLog | 42 +++++++++++++++++++++++++++++++++
libgomp/ChangeLog | 4 ++++
libphobos/ChangeLog | 5 ++++
maintainer-scripts/ChangeLog | 4 ++++
11 files changed, 181 insertions(+), 1 deletion(-)
diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index f7c1e867879..8e393b7ed72 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,17 @@
+2021-05-14 Martin Liska <mliska(a)suse.cz>
+
+ * download_prerequisites: Use version 4.1.0.
+
+2021-05-14 Jakub Jelinek <jakub(a)redhat.com>
+
+ * gcc-changelog/git_update_version.py: Remove releases/gcc-8 from
+ active_refs.
+
+2021-05-14 Martin Liska <mliska(a)suse.cz>
+
+ * gcc-changelog/git_commit.py: Support Co-Authored-By before
+ a first ChangeLog entry.
+
2021-05-13 Martin Liska <mliska(a)suse.cz>
* mklog.py: Put PR entries before all ChangeLog entries
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3b937d4d66f..dfa8ae2824f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,58 @@
+2021-05-14 Jason Merrill <jason(a)redhat.com>
+
+ * intl.h: Add comments.
+
+2021-05-14 Kyrylo Tkachov <kyrylo.tkachov(a)arm.com>
+
+ * config/aarch64/aarch64-simd.md
+ (aarch64_sqdml<SBINQOPS:as>l2_lane<mode>_internal): Split into...
+ (aarch64_sqdmlsl2_lane<mode>_internal): ... This...
+ (aarch64_sqdmlal2_lane<mode>_internal): ... And this.
+ (aarch64_sqdml<SBINQOPS:as>l2_laneq<mode>_internal): Split into ...
+ (aarch64_sqdmlsl2_laneq<mode>_internal): ... This...
+ (aarch64_sqdmlal2_laneq<mode>_internal): ... And this.
+ (aarch64_sqdml<SBINQOPS:as>l2_n<mode>_internal): Split into...
+ (aarch64_sqdmlsl2_n<mode>_internal): ... This...
+ (aarch64_sqdmlal2_n<mode>_internal): ... And this.
+
+2021-05-14 Prathamesh Kulkarni <prathamesh.kulkarni(a)linaro.org>
+
+ PR target/66791
+ * config/arm/arm_neon.h (vtst_s8): Replace call to vtst builtin with it's
+ boolean logic equivalent.
+ (vtst_s16): Likewise.
+ (vtst_s32): Likewise.
+ (vtst_u8): Likewise.
+ (vtst_u16): Likewise.
+ (vtst_u32): Likewise.
+ (vtst_p8): Likewise.
+ (vtst_p16): Likewise.
+ (vtstq_s8): Likewise.
+ (vtstq_s16): Likewise.
+ (vtstq_s32): Likewise.
+ (vtstq_u8): Likewise.
+ (vtstq_u16): Likewise.
+ (vtstq_u32): Likewise.
+ (vtstq_p8): Likewise.
+ (vtstq_p16): Likewise.
+ * config/arm/arm_neon_builtins.def: Remove entry for vtst.
+ * config/arm/neon.md (neon_vtst<mode>): Remove pattern.
+
+2021-05-14 Kyrylo Tkachov <kyrylo.tkachov(a)arm.com>
+
+ * config/aarch64/aarch64-simd.md (aarch64_sqdmlal2<mode>): Merge into...
+ (aarch64_sqdml<SBINQOPS:as>l2<mode>): ... This.
+ (aarch64_sqdmlsl2<mode>): Delete.
+ (aarch64_sqdmlal2_lane<mode>): Merge this...
+ (aarch64_sqdmlsl2_lane<mode>): ... And this...
+ (aarch64_sqdml<SBINQOPS:as>l2_lane<mode>): ... Into this.
+ (aarch64_sqdmlal2_laneq<mode>): Merge this...
+ (aarch64_sqdmlsl2_laneq<mode>): ... And this...
+ (aarch64_sqdml<SBINQOPS:as>l2_laneq<mode>): ... Into this.
+ (aarch64_sqdmlal2_n<mode>): Merge this...
+ (aarch64_sqdmlsl2_n<mode>): ... And this...
+ (aarch64_sqdml<SBINQOPS:as>l2_n<mode>): ... Into this.
+
2021-05-13 Martin Sebor <msebor(a)redhat.com>
PR middle-end/100574
diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index 552c3b209c0..40eb1cad583 100644
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20210514
+20210515
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 2279e46b775..514682006a7 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,9 @@
+2021-05-14 Martin Liska <mliska(a)suse.cz>
+
+ * doc/Makefile: Add gnat-style target.
+ * doc/share/conf.py: Likewise.
+ * doc/gnat-style.rst: New file.
+
2021-05-12 Bob Duff <duff(a)adacore.com>
PR ada/100564
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index d33ad4a4c57..7fc64a513d5 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,7 @@
+2021-05-14 Martin Liska <mliska(a)suse.cz>
+
+ * c.opt: Add Warning keyword for 2 options.
+
2021-05-13 Martin Liska <mliska(a)suse.cz>
PR middle-end/100504
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 5a8a650d3d7..48425b9dc67 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,24 @@
+2021-05-14 Jason Merrill <jason(a)redhat.com>
+
+ PR c++/95870
+ * pt.c (enclosing_instantiation_of): Just compare
+ DECL_SOURCE_LOCATION.
+ (regenerate_decl_from_template): Copy DECL_SOURCE_LOCATION.
+
+2021-05-14 Marek Polacek <polacek(a)redhat.com>
+ Jason Merrill <jason(a)redhat.com>
+
+ PR c++/99032
+ * cp-tree.h (any_non_type_attribute_p): Declare.
+ * decl.c (grokdeclarator): Diagnose when an attribute appertains to
+ a friend declaration that is not a definition.
+ * decl2.c (any_non_type_attribute_p): New.
+ * parser.c (cp_parser_decl_specifier_seq): Diagnose standard attributes
+ in the middle of decl-specifiers.
+ (cp_parser_elaborated_type_specifier): Diagnose when an attribute
+ appertains to a friend declaration that is not a definition.
+ (cp_parser_member_declaration): Likewise.
+
2021-05-12 Marek Polacek <polacek(a)redhat.com>
* pt.c (tsubst_copy_and_build): Add warn_int_in_bool_context
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 71cc3d86491..781dedd8220 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,28 @@
+2021-05-14 Tobias Burnus <tobias(a)codesourcery.com>
+
+ * dump-parse-tree.c (show_omp_node, show_code_node): Handle
+ EXEC_OMP_PARALLEL_MASTER.
+ * frontend-passes.c (gfc_code_walker): Likewise.
+ * gfortran.h (enum gfc_statement): Add ST_OMP_PARALLEL_MASTER and
+ ST_OMP_END_PARALLEL_MASTER.
+ (enum gfc_exec_op): Add EXEC_OMP_PARALLEL_MASTER..
+ * match.h (gfc_match_omp_parallel_master): Handle it.
+ * openmp.c (gfc_match_omp_parallel_master, resolve_omp_clauses,
+ omp_code_to_statement, gfc_resolve_omp_directive): Likewise.
+ * parse.c (decode_omp_directive, case_exec_markers,
+ gfc_ascii_statement, parse_omp_structured_block,
+ parse_executable): Likewise.
+ * resolve.c (gfc_resolve_blocks, gfc_resolve_code): Likewise.
+ * st.c (gfc_free_statement): Likewise.
+ * trans-openmp.c (gfc_trans_omp_parallel_master,
+ gfc_trans_omp_workshare, gfc_trans_omp_directive): Likewise.
+ * trans.c (trans_code): Likewise.
+
+2021-05-14 Tobias Burnus <tobias(a)codesourcery.com>
+
+ * resolve.c (resolve_symbol): Handle implicit SAVE of main-program
+ for vars in 'omp threadprivate' and 'omp declare target'.
+
2021-05-10 Martin Liska <mliska(a)suse.cz>
* decl.c (variable_decl): Use startswith
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9dfab7b873d..564795068b0 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,45 @@
+2021-05-14 Tobias Burnus <tobias(a)codesourcery.com>
+
+ * gfortran.dg/gomp/parallel-master-1.f90: New test.
+ * gfortran.dg/gomp/parallel-master-2.f90: New test.
+
+2021-05-14 Tobias Burnus <tobias(a)codesourcery.com>
+
+ * gfortran.dg/gomp/implicit-save.f90: New test.
+
+2021-05-14 Jakub Jelinek <jakub(a)redhat.com>
+
+ PR c++/95226
+ * g++.dg/cpp1y/pr95226.C: New test.
+
+2021-05-14 Jakub Jelinek <jakub(a)redhat.com>
+
+ PR c++/94616
+ * g++.dg/cpp0x/pr94616.C: New test.
+
+2021-05-14 Jakub Jelinek <jakub(a)redhat.com>
+
+ PR c++/90019
+ * g++.dg/cpp0x/sfinae68.C: New test.
+
+2021-05-14 Jakub Jelinek <jakub(a)redhat.com>
+
+ * g++.dg/cpp1y/pr88872.C: New test.
+
+2021-05-14 Michael de Lang <kingoipo(a)gmail.com>
+
+ * g++.dg/tsan/pthread_cond_clockwait.C: New test.
+
+2021-05-14 Marek Polacek <polacek(a)redhat.com>
+ Jason Merrill <jason(a)redhat.com>
+
+ PR c++/99032
+ * g++.dg/cpp0x/friend7.C: New test.
+ * g++.dg/cpp0x/gen-attrs-4.C: Add dg-error.
+ * g++.dg/cpp0x/gen-attrs-39-1.C: Likewise.
+ * g++.dg/cpp0x/gen-attrs-74.C: New test.
+ * g++.dg/ext/attrib63.C: New test.
+
2021-05-13 Martin Sebor <msebor(a)redhat.com>
PR tree-optimization/93100
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 1daf0c82f2c..424c574dce8 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,7 @@
+2021-05-14 Tobias Burnus <tobias(a)codesourcery.com>
+
+ * testsuite/libgomp.fortran/parallel-master.f90: New test.
+
2021-05-13 Martin Liska <mliska(a)suse.cz>
PR testsuite/100569
diff --git a/libphobos/ChangeLog b/libphobos/ChangeLog
index 7574416b9aa..7b57d92f64a 100644
--- a/libphobos/ChangeLog
+++ b/libphobos/ChangeLog
@@ -1,3 +1,8 @@
+2021-05-14 Bernd Edlinger <bernd.edlinger(a)hotmail.de>
+
+ * src/std/process.d (unittest): Remove tmpname on exit.
+ * src/MERGE: Merge upstream phobos 63f4caa90.
+
2021-05-13 Iain Buclaw <ibuclaw(a)gdcproject.org>
* libdruntime/MERGE: Merge upstream druntime 98c6ff0c.
diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index ab18cfd905d..8f306552396 100644
--- a/maintainer-scripts/ChangeLog
+++ b/maintainer-scripts/ChangeLog
@@ -1,3 +1,7 @@
+2021-05-14 Jakub Jelinek <jakub(a)redhat.com>
+
+ * crontab: Stop doing gcc-8 snapshots.
+
2021-04-20 Jakub Jelinek <jakub(a)redhat.com>
* crontab: Snapshots from trunk are now GCC 12 related.
</cut>
3 years, 10 months
- 1
- 0
[CI-NOTIFY]: TCWG Bisect tcwg_bmk_tx1/gnu-master-aarch64-spec2k6-O2_LTO - Build # 18 - Successful!
by ci_notify＠linaro.org
Successfully identified regression in *glibc* in CI configuration tcwg_bmk_gnu_tx1/gnu-master-aarch64-spec2k6-O2_LTO. So far, this commit has regressed CI configurations:
- tcwg_bmk_gnu_tx1/gnu-master-aarch64-spec2k6-O2_LTO
Culprit:
<cut>
commit f79f2065817e080f65f3c3a2fee966f5a97f1746
Author: Florian Weimer <fweimer(a)redhat.com>
Date: Wed Apr 21 19:49:50 2021 +0200
nptl: Move legacy unwinding implementation into libc
It is still used internally. Since unwinding is now available
unconditionally, avoid indirect calls through function pointers loaded
from the stack by inlining the non-cancellation cleanup code. This
avoids a regression in security hardening.
The out-of-line __libc_cleanup_routine implementation is no longer
needed because the inline definition is now static __always_inline.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella(a)linaro.org>
</cut>
Results regressed to (for first_bad == f79f2065817e080f65f3c3a2fee966f5a97f1746)
# reset_artifacts:
-10
# build_abe binutils:
-9
# build_abe stage1 -- --set gcc_override_configure=--disable-libsanitizer:
-8
# build_abe linux:
-7
# build_abe glibc:
-6
# build_abe stage2 -- --set gcc_override_configure=--disable-libsanitizer:
-5
# true:
0
# benchmark -O2_LTO -- artifacts/build-f79f2065817e080f65f3c3a2fee966f5a97f1746/results_id:
1
# 410.bwaves,bwaves_base.default regressed by 104
from (for last_good == 5715c29e91076800418833f2196f2082f439da75)
# reset_artifacts:
-10
# build_abe binutils:
-9
# build_abe stage1 -- --set gcc_override_configure=--disable-libsanitizer:
-8
# build_abe linux:
-7
# build_abe glibc:
-6
# build_abe stage2 -- --set gcc_override_configure=--disable-libsanitizer:
-5
# true:
0
# benchmark -O2_LTO -- artifacts/build-5715c29e91076800418833f2196f2082f439da75/results_id:
1
Artifacts of last_good build: https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tx1-gnu-master-aa…
Results ID of last_good: tx1_64/tcwg_bmk_gnu_tx1/bisect-gnu-master-aarch64-spec2k6-O2_LTO/461
Artifacts of first_bad build: https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tx1-gnu-master-aa…
Results ID of first_bad: tx1_64/tcwg_bmk_gnu_tx1/bisect-gnu-master-aarch64-spec2k6-O2_LTO/470
Build top page/logs: https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tx1-gnu-master-aa…
Configuration details:
Reproduce builds:
<cut>
mkdir investigate-glibc-f79f2065817e080f65f3c3a2fee966f5a97f1746
cd investigate-glibc-f79f2065817e080f65f3c3a2fee966f5a97f1746
git clone https://git.linaro.org/toolchain/jenkins-scripts
mkdir -p artifacts/manifests
curl -o artifacts/manifests/build-baseline.sh https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tx1-gnu-master-aa… --fail
curl -o artifacts/manifests/build-parameters.sh https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tx1-gnu-master-aa… --fail
curl -o artifacts/test.sh https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tx1-gnu-master-aa… --fail
chmod +x artifacts/test.sh
# Reproduce the baseline build (build all pre-requisites)
./jenkins-scripts/tcwg_bmk-build.sh @@ artifacts/manifests/build-baseline.sh
cd glibc
# Reproduce first_bad build
git checkout --detach f79f2065817e080f65f3c3a2fee966f5a97f1746
../artifacts/test.sh
# Reproduce last_good build
git checkout --detach 5715c29e91076800418833f2196f2082f439da75
../artifacts/test.sh
cd ..
</cut>
History of pending regressions and results: https://git.linaro.org/toolchain/ci/base-artifacts.git/log/?h=linaro-local/…
Artifacts: https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tx1-gnu-master-aa…
Build log: https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tx1-gnu-master-aa…
Full commit (up to 1000 lines):
<cut>
commit f79f2065817e080f65f3c3a2fee966f5a97f1746
Author: Florian Weimer <fweimer(a)redhat.com>
Date: Wed Apr 21 19:49:50 2021 +0200
nptl: Move legacy unwinding implementation into libc
It is still used internally. Since unwinding is now available
unconditionally, avoid indirect calls through function pointers loaded
from the stack by inlining the non-cancellation cleanup code. This
avoids a regression in security hardening.
The out-of-line __libc_cleanup_routine implementation is no longer
needed because the inline definition is now static __always_inline.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella(a)linaro.org>
---
nptl/Versions | 2 ++
nptl/cleanup_defer_compat.c | 56 ++---------------------------------
nptl/libc-cleanup.c | 64 ++++++++++++++++++++++++++++++++++++++--
nptl/nptl-init.c | 2 --
sysdeps/nptl/libc-lock.h | 59 ++++++++++++++++++------------------
sysdeps/nptl/libc-lockP.h | 26 +---------------
sysdeps/nptl/pthread-functions.h | 4 ---
7 files changed, 97 insertions(+), 116 deletions(-)
diff --git a/nptl/Versions b/nptl/Versions
index 60202b4969..2e5a964b11 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -87,6 +87,8 @@ libc {
__futex_abstimed_wait64;
__futex_abstimed_wait_cancelable64;
__libc_alloca_cutoff;
+ __libc_cleanup_pop_restore;
+ __libc_cleanup_push_defer;
__libc_dl_error_tsd;
__libc_pthread_init;
__lll_clocklock_elision;
diff --git a/nptl/cleanup_defer_compat.c b/nptl/cleanup_defer_compat.c
index 49ef53ea60..1957318208 100644
--- a/nptl/cleanup_defer_compat.c
+++ b/nptl/cleanup_defer_compat.c
@@ -17,41 +17,15 @@
<https://www.gnu.org/licenses/>. */
#include "pthreadP.h"
-
+#include <libc-lock.h>
void
_pthread_cleanup_push_defer (struct _pthread_cleanup_buffer *buffer,
void (*routine) (void *), void *arg)
{
- struct pthread *self = THREAD_SELF;
-
buffer->__routine = routine;
buffer->__arg = arg;
- buffer->__prev = THREAD_GETMEM (self, cleanup);
-
- int cancelhandling = THREAD_GETMEM (self, cancelhandling);
-
- /* Disable asynchronous cancellation for now. */
- if (__glibc_unlikely (cancelhandling & CANCELTYPE_BITMASK))
- while (1)
- {
- int curval = THREAD_ATOMIC_CMPXCHG_VAL (self, cancelhandling,
- cancelhandling
- & ~CANCELTYPE_BITMASK,
- cancelhandling);
- if (__glibc_likely (curval == cancelhandling))
- /* Successfully replaced the value. */
- break;
-
- /* Prepare for the next round. */
- cancelhandling = curval;
- }
-
- buffer->__canceltype = (cancelhandling & CANCELTYPE_BITMASK
- ? PTHREAD_CANCEL_ASYNCHRONOUS
- : PTHREAD_CANCEL_DEFERRED);
-
- THREAD_SETMEM (self, cleanup, buffer);
+ __libc_cleanup_push_defer (buffer);
}
strong_alias (_pthread_cleanup_push_defer, __pthread_cleanup_push_defer)
@@ -60,31 +34,7 @@ void
_pthread_cleanup_pop_restore (struct _pthread_cleanup_buffer *buffer,
int execute)
{
- struct pthread *self = THREAD_SELF;
-
- THREAD_SETMEM (self, cleanup, buffer->__prev);
-
- int cancelhandling;
- if (__builtin_expect (buffer->__canceltype != PTHREAD_CANCEL_DEFERRED, 0)
- && ((cancelhandling = THREAD_GETMEM (self, cancelhandling))
- & CANCELTYPE_BITMASK) == 0)
- {
- while (1)
- {
- int curval = THREAD_ATOMIC_CMPXCHG_VAL (self, cancelhandling,
- cancelhandling
- | CANCELTYPE_BITMASK,
- cancelhandling);
- if (__glibc_likely (curval == cancelhandling))
- /* Successfully replaced the value. */
- break;
-
- /* Prepare for the next round. */
- cancelhandling = curval;
- }
-
- CANCELLATION_P (self);
- }
+ __libc_cleanup_pop_restore (buffer);
/* If necessary call the cleanup routine after we removed the
current cleanup block from the list. */
diff --git a/nptl/libc-cleanup.c b/nptl/libc-cleanup.c
index 61f97eceda..14ccfe9285 100644
--- a/nptl/libc-cleanup.c
+++ b/nptl/libc-cleanup.c
@@ -17,11 +17,69 @@
<https://www.gnu.org/licenses/>. */
#include "pthreadP.h"
+#include <tls.h>
+#include <libc-lock.h>
+void
+__libc_cleanup_push_defer (struct _pthread_cleanup_buffer *buffer)
+{
+ struct pthread *self = THREAD_SELF;
+
+ buffer->__prev = THREAD_GETMEM (self, cleanup);
+
+ int cancelhandling = THREAD_GETMEM (self, cancelhandling);
+
+ /* Disable asynchronous cancellation for now. */
+ if (__glibc_unlikely (cancelhandling & CANCELTYPE_BITMASK))
+ while (1)
+ {
+ int curval = THREAD_ATOMIC_CMPXCHG_VAL (self, cancelhandling,
+ cancelhandling
+ & ~CANCELTYPE_BITMASK,
+ cancelhandling);
+ if (__glibc_likely (curval == cancelhandling))
+ /* Successfully replaced the value. */
+ break;
+
+ /* Prepare for the next round. */
+ cancelhandling = curval;
+ }
+
+ buffer->__canceltype = (cancelhandling & CANCELTYPE_BITMASK
+ ? PTHREAD_CANCEL_ASYNCHRONOUS
+ : PTHREAD_CANCEL_DEFERRED);
+
+ THREAD_SETMEM (self, cleanup, buffer);
+}
+libc_hidden_def (__libc_cleanup_push_defer)
void
-__libc_cleanup_routine (struct __pthread_cleanup_frame *f)
+__libc_cleanup_pop_restore (struct _pthread_cleanup_buffer *buffer)
{
- if (f->__do_it)
- f->__cancel_routine (f->__cancel_arg);
+ struct pthread *self = THREAD_SELF;
+
+ THREAD_SETMEM (self, cleanup, buffer->__prev);
+
+ int cancelhandling;
+ if (__builtin_expect (buffer->__canceltype != PTHREAD_CANCEL_DEFERRED, 0)
+ && ((cancelhandling = THREAD_GETMEM (self, cancelhandling))
+ & CANCELTYPE_BITMASK) == 0)
+ {
+ while (1)
+ {
+ int curval = THREAD_ATOMIC_CMPXCHG_VAL (self, cancelhandling,
+ cancelhandling
+ | CANCELTYPE_BITMASK,
+ cancelhandling);
+ if (__glibc_likely (curval == cancelhandling))
+ /* Successfully replaced the value. */
+ break;
+
+ /* Prepare for the next round. */
+ cancelhandling = curval;
+ }
+
+ CANCELLATION_P (self);
+ }
}
+libc_hidden_def (__libc_cleanup_pop_restore)
diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c
index 2c7e2222d4..43e2564e59 100644
--- a/nptl/nptl-init.c
+++ b/nptl/nptl-init.c
@@ -95,8 +95,6 @@ static const struct pthread_functions pthread_functions =
.ptr___pthread_key_create = __pthread_key_create,
.ptr___pthread_getspecific = __pthread_getspecific,
.ptr___pthread_setspecific = __pthread_setspecific,
- .ptr__pthread_cleanup_push_defer = __pthread_cleanup_push_defer,
- .ptr__pthread_cleanup_pop_restore = __pthread_cleanup_pop_restore,
.ptr_nthreads = &__nptl_nthreads,
.ptr___pthread_unwind = &__pthread_unwind,
.ptr__nptl_deallocate_tsd = __nptl_deallocate_tsd,
diff --git a/sysdeps/nptl/libc-lock.h b/sysdeps/nptl/libc-lock.h
index dea96121b3..e8a5e68a12 100644
--- a/sysdeps/nptl/libc-lock.h
+++ b/sysdeps/nptl/libc-lock.h
@@ -143,39 +143,40 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t;
__libc_maybe_call (__pthread_mutex_unlock, (&(NAME).mutex), 0)
#endif
-/* Note that for I/O cleanup handling we are using the old-style
- cancel handling. It does not have to be integrated with C++ since
- no C++ code is called in the middle. The old-style handling is
- faster and the support is not going away. */
-extern void _pthread_cleanup_push_defer (struct _pthread_cleanup_buffer *buffer,
- void (*routine) (void *), void *arg);
-extern void _pthread_cleanup_pop_restore (struct _pthread_cleanup_buffer *buffer,
- int execute);
+/* Put the unwind buffer BUFFER on the per-thread callback stack. The
+ caller must fill BUFFER->__routine and BUFFER->__arg before calling
+ this function. */
+void __libc_cleanup_push_defer (struct _pthread_cleanup_buffer *buffer);
+libc_hidden_proto (__libc_cleanup_push_defer)
+/* Remove BUFFER from the unwind callback stack. The caller must invoke
+ the callback if desired. */
+void __libc_cleanup_pop_restore (struct _pthread_cleanup_buffer *buffer);
+libc_hidden_proto (__libc_cleanup_pop_restore)
/* Start critical region with cleanup. */
-#define __libc_cleanup_region_start(DOIT, FCT, ARG) \
- { struct _pthread_cleanup_buffer _buffer; \
- int _avail; \
- if (DOIT) { \
- _avail = PTFAVAIL (_pthread_cleanup_push_defer); \
- if (_avail) { \
- __libc_ptf_call_always (_pthread_cleanup_push_defer, (&_buffer, FCT, \
- ARG)); \
- } else { \
- _buffer.__routine = (FCT); \
- _buffer.__arg = (ARG); \
- } \
- } else { \
- _avail = 0; \
- }
+#define __libc_cleanup_region_start(DOIT, FCT, ARG) \
+ { bool _cleanup_start_doit; \
+ struct _pthread_cleanup_buffer _buffer; \
+ /* Non-addressable copy of FCT, so that we avoid indirect calls on \
+ the non-unwinding path. */ \
+ void (*_cleanup_routine) (void *) = (FCT); \
+ _buffer.__arg = (ARG); \
+ if (DOIT) \
+ { \
+ _cleanup_start_doit = true; \
+ _buffer.__routine = _cleanup_routine; \
+ __libc_cleanup_push_defer (&_buffer); \
+ } \
+ else \
+ _cleanup_start_doit = false;
/* End critical region with cleanup. */
-#define __libc_cleanup_region_end(DOIT) \
- if (_avail) { \
- __libc_ptf_call_always (_pthread_cleanup_pop_restore, (&_buffer, DOIT));\
- } else if (DOIT) \
- _buffer.__routine (_buffer.__arg); \
- }
+#define __libc_cleanup_region_end(DOIT) \
+ if (_cleanup_start_doit) \
+ __libc_cleanup_pop_restore (&_buffer); \
+ if (DOIT) \
+ _cleanup_routine (_buffer.__arg); \
+ } /* matches __libc_cleanup_region_start */
/* Hide the definitions which are only supposed to be used inside libc in
diff --git a/sysdeps/nptl/libc-lockP.h b/sysdeps/nptl/libc-lockP.h
index 63b605dee2..2c928b7a76 100644
--- a/sysdeps/nptl/libc-lockP.h
+++ b/sysdeps/nptl/libc-lockP.h
@@ -251,32 +251,12 @@ _Static_assert (LLL_LOCK_INITIALIZER == 0, "LLL_LOCK_INITIALIZER != 0");
/* Get once control variable. */
#define __libc_once_get(ONCE_CONTROL) ((ONCE_CONTROL) != PTHREAD_ONCE_INIT)
-/* Note that for I/O cleanup handling we are using the old-style
- cancel handling. It does not have to be integrated with C++ snce
- no C++ code is called in the middle. The old-style handling is
- faster and the support is not going away. */
-extern void _pthread_cleanup_push (struct _pthread_cleanup_buffer *buffer,
- void (*routine) (void *), void *arg);
-extern void _pthread_cleanup_pop (struct _pthread_cleanup_buffer *buffer,
- int execute);
-extern void _pthread_cleanup_push_defer (struct _pthread_cleanup_buffer *buffer,
- void (*routine) (void *), void *arg);
-extern void _pthread_cleanup_pop_restore (struct _pthread_cleanup_buffer *buffer,
- int execute);
-
-/* Sometimes we have to exit the block in the middle. */
-#define __libc_cleanup_end(DOIT) \
- if (_avail) { \
- __libc_ptf_call_always (_pthread_cleanup_pop_restore, (&_buffer, DOIT));\
- } else if (DOIT) \
- _buffer.__routine (_buffer.__arg)
-
/* __libc_cleanup_push and __libc_cleanup_pop depend on exception
handling and stack unwinding. */
#ifdef __EXCEPTIONS
/* Normal cleanup handling, based on C cleanup attribute. */
-__extern_inline void
+static __always_inline void
__libc_cleanup_routine (struct __pthread_cleanup_frame *f)
{
if (f->__do_it)
@@ -388,8 +368,6 @@ weak_extern (__pthread_once)
weak_extern (__pthread_initialize)
weak_extern (__pthread_atfork)
weak_extern (__pthread_setcancelstate)
-weak_extern (_pthread_cleanup_push_defer)
-weak_extern (_pthread_cleanup_pop_restore)
# else
# pragma weak __pthread_mutex_init
# pragma weak __pthread_mutex_destroy
@@ -412,8 +390,6 @@ weak_extern (_pthread_cleanup_pop_restore)
# pragma weak __pthread_initialize
# pragma weak __pthread_atfork
# pragma weak __pthread_setcancelstate
-# pragma weak _pthread_cleanup_push_defer
-# pragma weak _pthread_cleanup_pop_restore
# endif
#endif
diff --git a/sysdeps/nptl/pthread-functions.h b/sysdeps/nptl/pthread-functions.h
index 97a5c48939..4268084b66 100644
--- a/sysdeps/nptl/pthread-functions.h
+++ b/sysdeps/nptl/pthread-functions.h
@@ -57,10 +57,6 @@ struct pthread_functions
int (*ptr___pthread_key_create) (pthread_key_t *, void (*) (void *));
void *(*ptr___pthread_getspecific) (pthread_key_t);
int (*ptr___pthread_setspecific) (pthread_key_t, const void *);
- void (*ptr__pthread_cleanup_push_defer) (struct _pthread_cleanup_buffer *,
- void (*) (void *), void *);
- void (*ptr__pthread_cleanup_pop_restore) (struct _pthread_cleanup_buffer *,
- int);
#define HAVE_PTR_NTHREADS
unsigned int *ptr_nthreads;
void (*ptr___pthread_unwind) (__pthread_unwind_buf_t *)
</cut>
3 years, 10 months
- 3
- 3
[ACTIVITY] week ending Jun. 27 2021
by Alex Bennée
VirtIO Initiative ([STR-9])
===========================
- spent some time trying to get Xen working on MachiatoBin again
- almost working, need SMC/HVC passthrough for platform
[STR-9] <https://projects.linaro.org/browse/STR-9>
QEMU Upstream Work ([UM-2])
===========================
- posted [[PATCH v3 0/2] semihosting/next (SYS_HEAPINFO)]
- posted [PULL 0/7] misc fixes (docs, plugins, tests) Message-Id:
<20210625091355.25673-1-alex.bennee(a)linaro.org>
[UM-2] <https://projects.linaro.org/browse/UM-2>
[[PATCH v3 0/2] semihosting/next (SYS_HEAPINFO)]
<gnus:nntp+news.gmane.io:gmane.comp.emulators.qemu#20210615165800.23265-1-alex.bennee@linaro.org>
[RFC PATCH] semihosting/arm-compat: remove heuristic softmmu SYS_HEAPINFO
Message-Id: <20210601090715.22330-1-alex.bennee(a)linaro.org>
Other
=====
- ARM CCA Announcement Event
- Rust Training
Completed Reviews [9/9]
=======================
[PATCH 00/11] softfloat: Improve denormal handling
Message-Id: <20210527041405.391567-1-richard.henderson(a)linaro.org>
[PATCH v2 00/28] Convert floatx80 and float128 to FloatParts
Message-Id: <20210525150706.294968-1-richard.henderson(a)linaro.org>
[PATCH 00/11] softfloat: Improve denormal handling
Message-Id: <20210527041405.391567-1-richard.henderson(a)linaro.org>
[PATCH v3 00/28] tcg: Clean up code_gen_buffer allocation
Message-Id: <20210502231844.1977630-1-richard.henderson(a)linaro.org>
Re: [PATCH] replay: fix watchpoint processing for reverse debugging
Message-Id: <fc75c7b5-e99c-f558-d24f-519041aa8d46(a)ispras.ru>
[Email from Richard Henderson: [PATCH v2 0/8] configure: Change to -std=gnu11]
[Email from Richard Henderson: [PATCH v2 0/8] configure: Change to
-std=gnu11]
<gnus:nntp+news.gmane.io:gmane.comp.emulators.qemu#20210614233143.1221879-1-richard.henderson@linaro.org>
[PATCH] i386: load kernel on xen using DMA
Message-Id: <20210426034709.595432-1-marmarek(a)invisiblethingslab.com>
[PATCH v2 0/2] execlog TCG plugin to log instructions
Message-Id: <20210618091101.2802534-1-erdnaxe(a)crans.org>
[RFC PATCH v3 0/4] Cache TCG plugin & symbol-resolution API
Message-Id: <20210608040532.56449-1-ma.mandourr(a)gmail.com>
Absences
========
Current Review Queue
====================
TODO [PATCH 00/26] accel/tcg: Introduce translator_use_goto_tb
Message-Id: <20210621013439.1791385-1-richard.henderson(a)linaro.org>
=================================================================================================================================
TODO [Email from Mathieu Poirier: [PATCH v2 0/5] virtio: Add vhost-user based RNG]
==================================================================================
[Email from Mathieu Poirier: [PATCH v2 0/5] virtio: Add vhost-user based
RNG]
<gnus:nntp+news.gmane.io:gmane.comp.emulators.qemu#20210614202842.581640-1-mathieu.poirier@linaro.org>
TODO [PATCH 0/5] virtio: Add vhost-user based RNG service
Message-Id: <20210601200305.1772391-1-mathieu.poirier(a)linaro.org>
==========================================================================================================================
TODO [RFC PATCH 0/5] ebpf: Added ebpf helper for libvirtd.
--
Alex Bennée
3 years, 10 months
- 1
- 0
[ACTIVITY] report week ending 25 Jun
by Peter Maydell
Progress:
* UM-2 [QEMU upstream maintainership]
+ Not much this week. Reviewed rth's bswap improvement/cleanup series
* QEMU-406 [QEMU support for MVE (M-profile Vector Extension; Helium)]
+ Implemented logical-immediate insns; various vector shifts; VADDLV;
some of the scalar shifts that work on general-purpose registers
+ Fixed a few bugs in already-implemented insns (widening/narrowing
load/store, and VRMLALDAVH, VRMLSLDAVH)
+ Progress: 102/210 (48%)
-- PMM
3 years, 10 months
- 1
- 0