This is an archive of the discontinued LLVM Phabricator instance.

Differential D103474

[PowerPC][AIX] Fix static_assert while bootstrapping.
ClosedPublic

Authored by sfertile on Jun 1 2021, 10:57 AM.

Details

Reviewers
hubert.reinterpretcast
nemanjai
jasonliu
Commits
rG81f7607f7c7d: [PowerPC][AIX} FIx AIX bootstrap build.
Summary

A recent patch https://reviews.llvm.org/rGe0921655b1ff8d4ba7c14be59252fe05b705920e changed clangs AIX bitfield handling to uses 4-byte bitfield containers, matching XLs behavior. This change triggers static assert failures when bootsrapping. Update the macros we check to enable bitfield packing on AIX to in check for __clang__ which is defined by both xlclang and clang.

Diff Detail

Event Timeline

sfertile created this revision.Jun 1 2021, 10:57 AM
Herald added subscribers: dexonsmith, shchenz. · View Herald TranscriptJun 1 2021, 10:57 AM
sfertile requested review of this revision.Jun 1 2021, 10:57 AM
Herald added a project: Restricted Project. · View Herald TranscriptJun 1 2021, 10:57 AM
Harbormaster completed remote builds in B107077: Diff 349022.Jun 1 2021, 11:53 AM
hubert.reinterpretcast accepted this revision.Jun 1 2021, 4:15 PM

LGTM; thanks!

This revision is now accepted and ready to land.Jun 1 2021, 4:15 PM
Closed by commit rG81f7607f7c7d: [PowerPC][AIX} FIx AIX bootstrap build. (authored by sfertile). · Explain WhyJun 2 2021, 6:32 AM
This revision was automatically updated to reflect the committed changes.
sfertile added a commit: rG81f7607f7c7d: [PowerPC][AIX} FIx AIX bootstrap build..

Revision Contents

PathSize
llvm/
include/
llvm/
CodeGen/
2 lines
IR/
2 lines

Diff 349022

llvm/include/llvm/CodeGen/SelectionDAGNodes.h

Show First 20 Lines • Show All 456 Lines • ▼ Show 20 Linesprivate:
/// The operation that this node performs. /// The operation that this node performs.
int16_t NodeType; int16_t NodeType;
protected: protected:
// We define a set of mini-helper classes to help us interpret the bits in our // We define a set of mini-helper classes to help us interpret the bits in our
// SubclassData. These are designed to fit within a uint16_t so they pack // SubclassData. These are designed to fit within a uint16_t so they pack
// with NodeType. // with NodeType.
#if defined(_AIX) && (!defined(__GNUC__) || defined(__ibmxl__)) #if defined(_AIX) && (!defined(__GNUC__) || defined(__clang__))
// Except for GCC; by default, AIX compilers store bit-fields in 4-byte words // Except for GCC; by default, AIX compilers store bit-fields in 4-byte words
// and give the `pack` pragma push semantics. // and give the `pack` pragma push semantics.
#define BEGIN_TWO_BYTE_PACK() _Pragma("pack(2)") #define BEGIN_TWO_BYTE_PACK() _Pragma("pack(2)")
#define END_TWO_BYTE_PACK() _Pragma("pack(pop)") #define END_TWO_BYTE_PACK() _Pragma("pack(pop)")
#else #else
#define BEGIN_TWO_BYTE_PACK() #define BEGIN_TWO_BYTE_PACK()
#define END_TWO_BYTE_PACK() #define END_TWO_BYTE_PACK()
#endif #endif
▲ Show 20 Lines • Show All 2,287 Lines • Show Last 20 Lines

llvm/include/llvm/IR/BasicBlock.h

Show First 20 Lines • Show All 507 Lines • ▼ Show 20 Linespublic:
/// should be careful not to call this in ways that make common operations /// should be careful not to call this in ways that make common operations
/// O(n^2). For example, it takes O(n) time to assign order numbers to /// O(n^2). For example, it takes O(n) time to assign order numbers to
/// instructions, so the order should be validated no more than once after /// instructions, so the order should be validated no more than once after
/// each ordering to ensure that transforms have the same algorithmic /// each ordering to ensure that transforms have the same algorithmic
/// complexity when asserts are enabled as when they are disabled. /// complexity when asserts are enabled as when they are disabled.
void validateInstrOrdering() const; void validateInstrOrdering() const;
private: private:
#if defined(_AIX) && (!defined(__GNUC__) || defined(__ibmxl__)) #if defined(_AIX) && (!defined(__GNUC__) || defined(__clang__))
// Except for GCC; by default, AIX compilers store bit-fields in 4-byte words // Except for GCC; by default, AIX compilers store bit-fields in 4-byte words
// and give the `pack` pragma push semantics. // and give the `pack` pragma push semantics.
#define BEGIN_TWO_BYTE_PACK() _Pragma("pack(2)") #define BEGIN_TWO_BYTE_PACK() _Pragma("pack(2)")
#define END_TWO_BYTE_PACK() _Pragma("pack(pop)") #define END_TWO_BYTE_PACK() _Pragma("pack(pop)")
#else #else
#define BEGIN_TWO_BYTE_PACK() #define BEGIN_TWO_BYTE_PACK()
#define END_TWO_BYTE_PACK() #define END_TWO_BYTE_PACK()
#endif #endif
▲ Show 20 Lines • Show All 64 Lines • Show Last 20 Lines