Skip to content

Commit

Permalink
[NFC] [Serialization] Packing more bits
Browse files Browse the repository at this point in the history 
This patch tries to reduce the size of the BMIs by packing more bits
into an unsigned integer.
  • Loading branch information
@ChuanqiXu9
ChuanqiXu9 committed Dec 11, 2023
1 parent 1d608fc commit 9406ea3
Show file tree
Hide file tree
Showing 5 changed files with 162 additions and 138 deletions.
21 changes: 14 additions & 7 deletions clang/lib/Serialization/ASTReaderDecl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -583,6 +583,9 @@ void ASTDeclReader::Visit(Decl *D) {
}

void ASTDeclReader::VisitDecl(Decl *D) {
BitsUnpacker DeclBits(Record.readInt());
bool HasStandaloneLexicalDC = DeclBits.getNextBit();

if (D->isTemplateParameter() || D->isTemplateParameterPack() ||
isa<ParmVarDecl, ObjCTypeParamDecl>(D)) {
// We don't want to deserialize the DeclContext of a template
Expand All @@ -592,7 +595,8 @@ void ASTDeclReader::VisitDecl(Decl *D) {
// return type of the function). Use the translation unit DeclContext as a
// placeholder.
GlobalDeclID SemaDCIDForTemplateParmDecl = readDeclID();
GlobalDeclID LexicalDCIDForTemplateParmDecl = readDeclID();
GlobalDeclID LexicalDCIDForTemplateParmDecl =
HasStandaloneLexicalDC ? readDeclID() : 0;
if (!LexicalDCIDForTemplateParmDecl)
LexicalDCIDForTemplateParmDecl = SemaDCIDForTemplateParmDecl;
Reader.addPendingDeclContextInfo(D,
Expand All @@ -601,7 +605,8 @@ void ASTDeclReader::VisitDecl(Decl *D) {
D->setDeclContext(Reader.getContext().getTranslationUnitDecl());
} else {
auto *SemaDC = readDeclAs<DeclContext>();
auto *LexicalDC = readDeclAs<DeclContext>();
auto *LexicalDC =
HasStandaloneLexicalDC ? readDeclAs<DeclContext>() : nullptr;
if (!LexicalDC)
LexicalDC = SemaDC;
// If the context is a class, we might not have actually merged it yet, in
Expand All @@ -618,7 +623,6 @@ void ASTDeclReader::VisitDecl(Decl *D) {
}
D->setLocation(ThisDeclLoc);

BitsUnpacker DeclBits(Record.readInt());
D->InvalidDecl = DeclBits.getNextBit();
bool HasAttrs = DeclBits.getNextBit();
D->setImplicit(DeclBits.getNextBit());
Expand Down Expand Up @@ -765,7 +769,7 @@ ASTDeclReader::RedeclarableResult ASTDeclReader::VisitTagDecl(TagDecl *TD) {
TD->setCompleteDefinitionRequired(TagDeclBits.getNextBit());
TD->setBraceRange(readSourceRange());

switch (Record.readInt()) {
switch (TagDeclBits.getNextBits(/*Width=*/2)) {
case 0:
break;
case 1: { // ExtInfo
Expand Down Expand Up @@ -1089,7 +1093,8 @@ void ASTDeclReader::VisitFunctionDecl(FunctionDecl *FD) {
FD->setCachedLinkage((Linkage)FunctionDeclBits.getNextBits(/*Width=*/3));

FD->EndRangeLoc = readSourceLocation();
FD->setDefaultLoc(readSourceLocation());
if (FD->isExplicitlyDefaulted())
FD->setDefaultLoc(readSourceLocation());

FD->ODRHash = Record.readInt();
FD->setHasODRHash(true);
Expand Down Expand Up @@ -1703,7 +1708,7 @@ void ASTDeclReader::VisitParmVarDecl(ParmVarDecl *PD) {
unsigned isObjCMethodParam = ParmVarDeclBits.getNextBit();
unsigned scopeDepth = ParmVarDeclBits.getNextBits(/*Width=*/7);
unsigned scopeIndex = ParmVarDeclBits.getNextBits(/*Width=*/8);
unsigned declQualifier = Record.readInt();
unsigned declQualifier = ParmVarDeclBits.getNextBits(/*Width=*/7);
if (isObjCMethodParam) {
assert(scopeDepth == 0);
PD->setObjCMethodScopeInfo(scopeIndex);
Expand All @@ -1716,7 +1721,9 @@ void ASTDeclReader::VisitParmVarDecl(ParmVarDecl *PD) {
PD->ParmVarDeclBits.HasInheritedDefaultArg = ParmVarDeclBits.getNextBit();
if (ParmVarDeclBits.getNextBit()) // hasUninstantiatedDefaultArg.
PD->setUninstantiatedDefaultArg(Record.readExpr());
PD->ExplicitObjectParameterIntroducerLoc = Record.readSourceLocation();

if (ParmVarDeclBits.getNextBit()) // Valid explicit object parameter
PD->ExplicitObjectParameterIntroducerLoc = Record.readSourceLocation();

// FIXME: If this is a redeclaration of a function from another module, handle
// inheritance of default arguments.
Expand Down
72 changes: 42 additions & 30 deletions clang/lib/Serialization/ASTReaderStmt.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ namespace clang {

/// The number of record fields required for the Expr class
/// itself.
static const unsigned NumExprFields = NumStmtFields + 4;
static const unsigned NumExprFields = NumStmtFields + 2;

/// Read and initialize a ExplicitTemplateArgumentList structure.
void ReadTemplateKWAndArgsInfo(ASTTemplateKWAndArgsInfo &Args,
Expand Down Expand Up @@ -524,9 +524,13 @@ void ASTStmtReader::VisitCapturedStmt(CapturedStmt *S) {
void ASTStmtReader::VisitExpr(Expr *E) {
VisitStmt(E);
E->setType(Record.readType());
E->setDependence(static_cast<ExprDependence>(Record.readInt()));
E->setValueKind(static_cast<ExprValueKind>(Record.readInt()));
E->setObjectKind(static_cast<ExprObjectKind>(Record.readInt()));
BitsUnpacker ExprBits(Record.readInt());
E->setDependence(
static_cast<ExprDependence>(ExprBits.getNextBits(/*Width=*/5)));
E->setValueKind(
static_cast<ExprValueKind>(ExprBits.getNextBits(/*Width=*/2)));
E->setObjectKind(
static_cast<ExprObjectKind>(ExprBits.getNextBits(/*Width=*/3)));
assert(Record.getIdx() == NumExprFields &&
"Incorrect expression field count");
}
Expand Down Expand Up @@ -995,14 +999,19 @@ void ASTStmtReader::VisitOMPIteratorExpr(OMPIteratorExpr *E) {

void ASTStmtReader::VisitCallExpr(CallExpr *E) {
VisitExpr(E);
unsigned NumArgs = Record.readInt();
bool HasFPFeatures = Record.readInt();

BitsUnpacker CallExprBits = Record.readInt();

unsigned NumArgs = CallExprBits.getNextBits(/*Width=*/16);
bool HasFPFeatures = CallExprBits.getNextBit();
E->setADLCallKind(
static_cast<CallExpr::ADLCallKind>(CallExprBits.getNextBit()));
assert((NumArgs == E->getNumArgs()) && "Wrong NumArgs!");
E->setRParenLoc(readSourceLocation());
E->setCallee(Record.readSubExpr());
for (unsigned I = 0; I != NumArgs; ++I)
E->setArg(I, Record.readSubExpr());
E->setADLCallKind(static_cast<CallExpr::ADLCallKind>(Record.readInt()));

if (HasFPFeatures)
E->setStoredFPFeatures(
FPOptionsOverride::getFromOpaqueInt(Record.readInt()));
Expand Down Expand Up @@ -2013,14 +2022,15 @@ ASTStmtReader::VisitCXXUnresolvedConstructExpr(CXXUnresolvedConstructExpr *E) {
void ASTStmtReader::VisitOverloadExpr(OverloadExpr *E) {
VisitExpr(E);

unsigned NumResults = Record.readInt();
bool HasTemplateKWAndArgsInfo = Record.readInt();
BitsUnpacker OverloadExprBits = Record.readInt();
unsigned NumResults = OverloadExprBits.getNextBits(/*Width=*/14);
bool HasTemplateKWAndArgsInfo = OverloadExprBits.getNextBit();
assert((E->getNumDecls() == NumResults) && "Wrong NumResults!");
assert((E->hasTemplateKWAndArgsInfo() == HasTemplateKWAndArgsInfo) &&
"Wrong HasTemplateKWAndArgsInfo!");

if (HasTemplateKWAndArgsInfo) {
unsigned NumTemplateArgs = Record.readInt();
unsigned NumTemplateArgs = OverloadExprBits.getNextBits(/*Width=*/14);
ReadTemplateKWAndArgsInfo(*E->getTrailingASTTemplateKWAndArgsInfo(),
E->getTrailingTemplateArgumentLoc(),
NumTemplateArgs);
Expand Down Expand Up @@ -3024,8 +3034,9 @@ Stmt *ASTReader::ReadStmtFromStream(ModuleFile &F) {

case EXPR_CALL:
S = CallExpr::CreateEmpty(
Context, /*NumArgs=*/Record[ASTStmtReader::NumExprFields],
/*HasFPFeatures=*/Record[ASTStmtReader::NumExprFields + 1], Empty);
Context, /*NumArgs=*/Record[ASTStmtReader::NumExprFields] & 0xffff,
/*HasFPFeatures=*/
((Record[ASTStmtReader::NumExprFields] >> 16) & 0x1), Empty);
break;

case EXPR_RECOVERY:
Expand Down Expand Up @@ -3766,14 +3777,16 @@ Stmt *ASTReader::ReadStmtFromStream(ModuleFile &F) {

case EXPR_CXX_OPERATOR_CALL:
S = CXXOperatorCallExpr::CreateEmpty(
Context, /*NumArgs=*/Record[ASTStmtReader::NumExprFields],
/*HasFPFeatures=*/Record[ASTStmtReader::NumExprFields + 1], Empty);
Context, /*NumArgs=*/Record[ASTStmtReader::NumExprFields] & 0xffff,
/*HasFPFeatures=*/
((Record[ASTStmtReader::NumExprFields] >> 16) & 0x1), Empty);
break;

case EXPR_CXX_MEMBER_CALL:
S = CXXMemberCallExpr::CreateEmpty(
Context, /*NumArgs=*/Record[ASTStmtReader::NumExprFields],
/*HasFPFeatures=*/Record[ASTStmtReader::NumExprFields + 1], Empty);
Context, /*NumArgs=*/Record[ASTStmtReader::NumExprFields] & 0xffff,
/*HasFPFeatures=*/
((Record[ASTStmtReader::NumExprFields] >> 16) & 0x1), Empty);
break;

case EXPR_CXX_REWRITTEN_BINARY_OPERATOR:
Expand Down Expand Up @@ -3948,23 +3961,21 @@ Stmt *ASTReader::ReadStmtFromStream(ModuleFile &F) {
case EXPR_CXX_UNRESOLVED_MEMBER:
S = UnresolvedMemberExpr::CreateEmpty(
Context,
/*NumResults=*/Record[ASTStmtReader::NumExprFields],
/*HasTemplateKWAndArgsInfo=*/Record[ASTStmtReader::NumExprFields + 1],
/*NumTemplateArgs=*/
Record[ASTStmtReader::NumExprFields + 1]
? Record[ASTStmtReader::NumExprFields + 2]
: 0);
/*NumResults=*/Record[ASTStmtReader::NumExprFields] & ((1 << 14) - 1),
/*HasTemplateKWAndArgsInfo=*/
(Record[ASTStmtReader::NumExprFields] >> 14) & (0x1),
/*NumTemplateArgs=*/Record[ASTStmtReader::NumExprFields] >> 14 &
((1 << 14) - 1));
break;

case EXPR_CXX_UNRESOLVED_LOOKUP:
S = UnresolvedLookupExpr::CreateEmpty(
Context,
/*NumResults=*/Record[ASTStmtReader::NumExprFields],
/*HasTemplateKWAndArgsInfo=*/Record[ASTStmtReader::NumExprFields + 1],
/*NumTemplateArgs=*/
Record[ASTStmtReader::NumExprFields + 1]
? Record[ASTStmtReader::NumExprFields + 2]
: 0);
/*NumResults=*/Record[ASTStmtReader::NumExprFields] & ((1 << 14) - 1),
/*HasTemplateKWAndArgsInfo=*/
(Record[ASTStmtReader::NumExprFields] >> 14) & (0x1),
/*NumTemplateArgs=*/Record[ASTStmtReader::NumExprFields] >> 14 &
((1 << 14) - 1));
break;

case EXPR_TYPE_TRAIT:
Expand Down Expand Up @@ -4026,8 +4037,9 @@ Stmt *ASTReader::ReadStmtFromStream(ModuleFile &F) {

case EXPR_CUDA_KERNEL_CALL:
S = CUDAKernelCallExpr::CreateEmpty(
Context, /*NumArgs=*/Record[ASTStmtReader::NumExprFields],
/*HasFPFeatures=*/Record[ASTStmtReader::NumExprFields + 1], Empty);
Context, /*NumArgs=*/Record[ASTStmtReader::NumExprFields] & 0xffff,
/*HasFPFeatures=*/
((Record[ASTStmtReader::NumExprFields] >> 16) & 0x1), Empty);
break;

case EXPR_ASTYPE:
Expand Down

0 comments on commit 9406ea3

Please sign in to comment.