Skip to content

Commit 3573343

Browse files
SC llvm teamSC llvm team
SC llvm team
authored and
SC llvm team
committed
Merged main:202de4a5c6ed into amd-gfx:63f08b5fd01a
Local branch amd-gfx 63f08b5 Merged main:d40413013425 into amd-gfx:85fdb0385e9e Remote branch main 202de4a Fix __builtin_vectorelements tests with REQUIRES (llvm#69582)
2 parents 63f08b5 + 202de4a commit 3573343

File tree

25 files changed

+726
-124
lines changed

25 files changed

+726
-124
lines changed

‎clang/include/clang/Analysis/FlowSensitive/Arena.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ namespace clang::dataflow {
2020
/// For example, `Value`, `StorageLocation`, `Atom`, and `Formula`.
2121
class Arena {
2222
public:
23-
Arena() : True(makeAtom()), False(makeAtom()) {}
23+
Arena()
24+
: True(Formula::create(Alloc, Formula::Literal, {}, 1)),
25+
False(Formula::create(Alloc, Formula::Literal, {}, 0)) {}
2426
Arena(const Arena &) = delete;
2527
Arena &operator=(const Arena &) = delete;
2628

@@ -106,9 +108,7 @@ class Arena {
106108
const Formula &makeAtomRef(Atom A);
107109

108110
/// Returns a formula for a literal true/false.
109-
const Formula &makeLiteral(bool Value) {
110-
return makeAtomRef(Value ? True : False);
111-
}
111+
const Formula &makeLiteral(bool Value) { return Value ? True : False; }
112112

113113
// Parses a formula from its textual representation.
114114
// This may refer to atoms that were not produced by makeAtom() yet!
@@ -144,7 +144,7 @@ class Arena {
144144
llvm::DenseMap<const Formula *, BoolValue *> FormulaValues;
145145
unsigned NextAtom = 0;
146146

147-
Atom True, False;
147+
const Formula &True, &False;
148148
};
149149

150150
} // namespace clang::dataflow

‎clang/include/clang/Analysis/FlowSensitive/DataflowEnvironment.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -473,9 +473,8 @@ class Environment {
473473

474474
/// Returns a symbolic boolean value that models a boolean literal equal to
475475
/// `Value`
476-
AtomicBoolValue &getBoolLiteralValue(bool Value) const {
477-
return cast<AtomicBoolValue>(
478-
arena().makeBoolValue(arena().makeLiteral(Value)));
476+
BoolValue &getBoolLiteralValue(bool Value) const {
477+
return arena().makeBoolValue(arena().makeLiteral(Value));
479478
}
480479

481480
/// Returns an atomic boolean value.

‎clang/include/clang/Analysis/FlowSensitive/Formula.h

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ class alignas(const Formula *) Formula {
5252
/// A reference to an atomic boolean variable.
5353
/// We name these e.g. "V3", where 3 == atom identity == Value.
5454
AtomRef,
55-
// FIXME: add const true/false rather than modeling them as variables
55+
/// Constant true or false.
56+
Literal,
5657

5758
Not, /// True if its only operand is false
5859

@@ -69,6 +70,11 @@ class alignas(const Formula *) Formula {
6970
return static_cast<Atom>(Value);
7071
}
7172

73+
bool literal() const {
74+
assert(kind() == Literal);
75+
return static_cast<bool>(Value);
76+
}
77+
7278
ArrayRef<const Formula *> operands() const {
7379
return ArrayRef(reinterpret_cast<Formula *const *>(this + 1),
7480
numOperands(kind()));
@@ -81,9 +87,9 @@ class alignas(const Formula *) Formula {
8187
void print(llvm::raw_ostream &OS, const AtomNames * = nullptr) const;
8288

8389
// Allocate Formulas using Arena rather than calling this function directly.
84-
static Formula &create(llvm::BumpPtrAllocator &Alloc, Kind K,
85-
ArrayRef<const Formula *> Operands,
86-
unsigned Value = 0);
90+
static const Formula &create(llvm::BumpPtrAllocator &Alloc, Kind K,
91+
ArrayRef<const Formula *> Operands,
92+
unsigned Value = 0);
8793

8894
private:
8995
Formula() = default;
@@ -93,6 +99,7 @@ class alignas(const Formula *) Formula {
9399
static unsigned numOperands(Kind K) {
94100
switch (K) {
95101
case AtomRef:
102+
case Literal:
96103
return 0;
97104
case Not:
98105
return 1;

‎clang/lib/Analysis/FlowSensitive/Arena.cpp

Lines changed: 60 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -22,63 +22,83 @@ canonicalFormulaPair(const Formula &LHS, const Formula &RHS) {
2222
return Res;
2323
}
2424

25-
const Formula &Arena::makeAtomRef(Atom A) {
26-
auto [It, Inserted] = AtomRefs.try_emplace(A);
25+
template <class Key, class ComputeFunc>
26+
const Formula &cached(llvm::DenseMap<Key, const Formula *> &Cache, Key K,
27+
ComputeFunc &&Compute) {
28+
auto [It, Inserted] = Cache.try_emplace(std::forward<Key>(K));
2729
if (Inserted)
28-
It->second =
29-
&Formula::create(Alloc, Formula::AtomRef, {}, static_cast<unsigned>(A));
30+
It->second = Compute();
3031
return *It->second;
3132
}
3233

33-
const Formula &Arena::makeAnd(const Formula &LHS, const Formula &RHS) {
34-
if (&LHS == &RHS)
35-
return LHS;
34+
const Formula &Arena::makeAtomRef(Atom A) {
35+
return cached(AtomRefs, A, [&] {
36+
return &Formula::create(Alloc, Formula::AtomRef, {},
37+
static_cast<unsigned>(A));
38+
});
39+
}
3640

37-
auto [It, Inserted] =
38-
Ands.try_emplace(canonicalFormulaPair(LHS, RHS), nullptr);
39-
if (Inserted)
40-
It->second = &Formula::create(Alloc, Formula::And, {&LHS, &RHS});
41-
return *It->second;
41+
const Formula &Arena::makeAnd(const Formula &LHS, const Formula &RHS) {
42+
return cached(Ands, canonicalFormulaPair(LHS, RHS), [&] {
43+
if (&LHS == &RHS)
44+
return &LHS;
45+
if (LHS.kind() == Formula::Literal)
46+
return LHS.literal() ? &RHS : &LHS;
47+
if (RHS.kind() == Formula::Literal)
48+
return RHS.literal() ? &LHS : &RHS;
49+
50+
return &Formula::create(Alloc, Formula::And, {&LHS, &RHS});
51+
});
4252
}
4353

4454
const Formula &Arena::makeOr(const Formula &LHS, const Formula &RHS) {
45-
if (&LHS == &RHS)
46-
return LHS;
47-
48-
auto [It, Inserted] =
49-
Ors.try_emplace(canonicalFormulaPair(LHS, RHS), nullptr);
50-
if (Inserted)
51-
It->second = &Formula::create(Alloc, Formula::Or, {&LHS, &RHS});
52-
return *It->second;
55+
return cached(Ors, canonicalFormulaPair(LHS, RHS), [&] {
56+
if (&LHS == &RHS)
57+
return &LHS;
58+
if (LHS.kind() == Formula::Literal)
59+
return LHS.literal() ? &LHS : &RHS;
60+
if (RHS.kind() == Formula::Literal)
61+
return RHS.literal() ? &RHS : &LHS;
62+
63+
return &Formula::create(Alloc, Formula::Or, {&LHS, &RHS});
64+
});
5365
}
5466

5567
const Formula &Arena::makeNot(const Formula &Val) {
56-
auto [It, Inserted] = Nots.try_emplace(&Val, nullptr);
57-
if (Inserted)
58-
It->second = &Formula::create(Alloc, Formula::Not, {&Val});
59-
return *It->second;
68+
return cached(Nots, &Val, [&] {
69+
if (Val.kind() == Formula::Not)
70+
return Val.operands()[0];
71+
if (Val.kind() == Formula::Literal)
72+
return &makeLiteral(!Val.literal());
73+
74+
return &Formula::create(Alloc, Formula::Not, {&Val});
75+
});
6076
}
6177

6278
const Formula &Arena::makeImplies(const Formula &LHS, const Formula &RHS) {
63-
if (&LHS == &RHS)
64-
return makeLiteral(true);
65-
66-
auto [It, Inserted] =
67-
Implies.try_emplace(std::make_pair(&LHS, &RHS), nullptr);
68-
if (Inserted)
69-
It->second = &Formula::create(Alloc, Formula::Implies, {&LHS, &RHS});
70-
return *It->second;
79+
return cached(Implies, std::make_pair(&LHS, &RHS), [&] {
80+
if (&LHS == &RHS)
81+
return &makeLiteral(true);
82+
if (LHS.kind() == Formula::Literal)
83+
return LHS.literal() ? &RHS : &makeLiteral(true);
84+
if (RHS.kind() == Formula::Literal)
85+
return RHS.literal() ? &RHS : &makeNot(LHS);
86+
87+
return &Formula::create(Alloc, Formula::Implies, {&LHS, &RHS});
88+
});
7189
}
7290

7391
const Formula &Arena::makeEquals(const Formula &LHS, const Formula &RHS) {
74-
if (&LHS == &RHS)
75-
return makeLiteral(true);
76-
77-
auto [It, Inserted] =
78-
Equals.try_emplace(canonicalFormulaPair(LHS, RHS), nullptr);
79-
if (Inserted)
80-
It->second = &Formula::create(Alloc, Formula::Equal, {&LHS, &RHS});
81-
return *It->second;
92+
return cached(Equals, canonicalFormulaPair(LHS, RHS), [&] {
93+
if (&LHS == &RHS)
94+
return &makeLiteral(true);
95+
if (LHS.kind() == Formula::Literal)
96+
return LHS.literal() ? &RHS : &makeNot(RHS);
97+
if (RHS.kind() == Formula::Literal)
98+
return RHS.literal() ? &LHS : &makeNot(LHS);
99+
100+
return &Formula::create(Alloc, Formula::Equal, {&LHS, &RHS});
101+
});
82102
}
83103

84104
IntegerValue &Arena::makeIntLiteral(llvm::APInt Value) {

‎clang/lib/Analysis/FlowSensitive/DataflowAnalysisContext.cpp

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,6 @@ DataflowAnalysisContext::joinFlowConditions(Atom FirstToken,
141141

142142
Solver::Result DataflowAnalysisContext::querySolver(
143143
llvm::SetVector<const Formula *> Constraints) {
144-
Constraints.insert(&arena().makeLiteral(true));
145-
Constraints.insert(&arena().makeNot(arena().makeLiteral(false)));
146144
return S->solve(Constraints.getArrayRef());
147145
}
148146

@@ -213,13 +211,8 @@ void DataflowAnalysisContext::dumpFlowCondition(Atom Token,
213211
Constraints.insert(&arena().makeAtomRef(Token));
214212
addTransitiveFlowConditionConstraints(Token, Constraints);
215213

216-
// TODO: have formulas know about true/false directly instead
217-
Atom True = arena().makeLiteral(true).getAtom();
218-
Atom False = arena().makeLiteral(false).getAtom();
219-
Formula::AtomNames Names = {{False, "false"}, {True, "true"}};
220-
221214
for (const auto *Constraint : Constraints) {
222-
Constraint->print(OS, &Names);
215+
Constraint->print(OS);
223216
OS << "\n";
224217
}
225218
}

‎clang/lib/Analysis/FlowSensitive/Formula.cpp

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@
1717

1818
namespace clang::dataflow {
1919

20-
Formula &Formula::create(llvm::BumpPtrAllocator &Alloc, Kind K,
21-
ArrayRef<const Formula *> Operands, unsigned Value) {
20+
const Formula &Formula::create(llvm::BumpPtrAllocator &Alloc, Kind K,
21+
ArrayRef<const Formula *> Operands,
22+
unsigned Value) {
2223
assert(Operands.size() == numOperands(K));
2324
if (Value != 0) // Currently, formulas have values or operands, not both.
2425
assert(numOperands(K) == 0);
@@ -38,6 +39,7 @@ Formula &Formula::create(llvm::BumpPtrAllocator &Alloc, Kind K,
3839
static llvm::StringLiteral sigil(Formula::Kind K) {
3940
switch (K) {
4041
case Formula::AtomRef:
42+
case Formula::Literal:
4143
return "";
4244
case Formula::Not:
4345
return "!";
@@ -62,7 +64,16 @@ void Formula::print(llvm::raw_ostream &OS, const AtomNames *Names) const {
6264

6365
switch (numOperands(kind())) {
6466
case 0:
65-
OS << getAtom();
67+
switch (kind()) {
68+
case AtomRef:
69+
OS << getAtom();
70+
break;
71+
case Literal:
72+
OS << (literal() ? "true" : "false");
73+
break;
74+
default:
75+
llvm_unreachable("unhandled formula kind");
76+
}
6677
break;
6778
case 1:
6879
OS << sigil(kind());

‎clang/lib/Analysis/FlowSensitive/WatchedLiteralsSolver.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,9 @@ CNFFormula buildCNF(const llvm::ArrayRef<const Formula *> &Vals) {
322322
switch (Val->kind()) {
323323
case Formula::AtomRef:
324324
break;
325+
case Formula::Literal:
326+
CNF.addClause(Val->literal() ? posLit(Var) : negLit(Var));
327+
break;
325328
case Formula::And: {
326329
const Variable LHS = GetVar(Val->operands()[0]);
327330
const Variable RHS = GetVar(Val->operands()[1]);

‎clang/test/AST/Interp/bitfields.cpp

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
// RUN: %clang_cc1 -fexperimental-new-constant-interpreter -Wno-bitfield-constant-conversion -verify %s
22
// RUN: %clang_cc1 -verify=ref -Wno-bitfield-constant-conversion %s
3+
// RUN: %clang_cc1 -std=c++20 -fexperimental-new-constant-interpreter -Wno-bitfield-constant-conversion -verify %s
4+
// RUN: %clang_cc1 -std=c++20 -verify=ref -Wno-bitfield-constant-conversion %s
35

46
// expected-no-diagnostics
57
// ref-no-diagnostics
@@ -31,6 +33,27 @@ namespace Basic {
3133
return a.a = 10;
3234
}
3335
static_assert(storeA2() == 2, "");
36+
37+
#if __cplusplus >= 202002
38+
struct Init1 {
39+
unsigned a : 2 = 1;
40+
};
41+
constexpr Init1 I1{};
42+
static_assert(I1.a == 1, "");
43+
44+
struct Init2 {
45+
unsigned a : 2 = 100;
46+
};
47+
constexpr Init2 I2{};
48+
static_assert(I2.a == 0, "");
49+
#endif
50+
51+
struct Init3 {
52+
unsigned a : 2;
53+
constexpr Init3() : a(100) {}
54+
};
55+
constexpr Init3 I3{};
56+
static_assert(I3.a == 0, "");
3457
}
3558

3659
namespace Overflow {

‎clang/test/CodeGen/builtin_vectorelements.c

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
1-
// RUN: %clang_cc1 -O1 -triple aarch64 -target-feature +neon %s -emit-llvm -disable-llvm-passes -o - | FileCheck --check-prefixes=CHECK,NEON %s
2-
// RUN: %clang_cc1 -O1 -triple aarch64 -target-feature +sve %s -emit-llvm -disable-llvm-passes -o - | FileCheck --check-prefixes=CHECK,SVE %s
3-
// RUN: %clang_cc1 -O1 -triple riscv64 -target-feature +v %s -emit-llvm -disable-llvm-passes -o - | FileCheck --check-prefixes=CHECK,RISCV %s
1+
// RUN: %clang_cc1 -O1 -triple x86_64 %s -emit-llvm -disable-llvm-passes -o - | FileCheck --check-prefixes=CHECK %s
42

5-
// Note that this does not make sense to check for x86 SIMD types, because
6-
// __m128i, __m256i, and __m512i do not specify the element type. There are no
7-
// "logical" number of elements in them.
3+
// REQUIRES: target=aarch64-{{.*}}
4+
// RUN: %clang_cc1 -O1 -triple aarch64 -target-feature +neon %s -emit-llvm -disable-llvm-passes -o - | FileCheck --check-prefixes=CHECK,NEON %s
5+
6+
// REQUIRES: target=aarch64-{{.*}}
7+
// RUN: %clang_cc1 -O1 -triple aarch64 -target-feature +sve %s -emit-llvm -disable-llvm-passes -o - | FileCheck --check-prefixes=CHECK,SVE %s
8+
9+
// REQUIRES: target=riscv64{{.*}}
10+
// RUN: %clang_cc1 -O1 -triple riscv64 -target-feature +v %s -emit-llvm -disable-llvm-passes -o - | FileCheck --check-prefixes=CHECK,RISCV %s
11+
12+
/// Note that this does not make sense to check for x86 SIMD types, because
13+
/// __m128i, __m256i, and __m512i do not specify the element type. There are no
14+
/// "logical" number of elements in them.
815

916
typedef int int1 __attribute__((vector_size(4)));
1017
typedef int int4 __attribute__((vector_size(16)));
@@ -56,7 +63,6 @@ int test_builtin_vectorelements_multiply_constant() {
5663
return __builtin_vectorelements(int16) * 2;
5764
}
5865

59-
6066
#if defined(__ARM_NEON)
6167
#include <arm_neon.h>
6268

‎clang/test/SemaCXX/builtin_vectorelements.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// RUN: %clang_cc1 -triple x86_64 -std=c++20 -fsyntax-only -verify -disable-llvm-passes %s
2+
3+
// REQUIRES: target=aarch64-{{.*}}
14
// RUN: %clang_cc1 -triple aarch64 -target-feature +sve -std=c++20 -fsyntax-only -verify -disable-llvm-passes %s
25

36
template <typename T>

0 commit comments

Comments
 (0)