|
|
|
// Protocol Buffers - Google's data interchange format
|
|
|
|
// Copyright 2023 Google LLC. All rights reserved.
|
|
|
|
//
|
|
|
|
// Use of this source code is governed by a BSD-style
|
|
|
|
// license that can be found in the LICENSE file or at
|
|
|
|
// https://developers.google.com/open-source/licenses/bsd
|
|
|
|
|
|
|
|
#include "upb/util/required_fields.h"
|
|
|
|
|
|
|
|
#include <assert.h>
|
|
|
|
#include <inttypes.h>
|
|
|
|
#include <setjmp.h>
|
|
|
|
#include <stdarg.h>
|
|
|
|
#include <stdbool.h>
|
|
|
|
#include <stddef.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
#include "upb/base/descriptor_constants.h"
|
|
|
|
#include "upb/mem/alloc.h"
|
|
|
|
#include "upb/message/array.h"
|
|
|
|
#include "upb/message/map.h"
|
|
|
|
#include "upb/message/message.h"
|
|
|
|
#include "upb/port/vsnprintf_compat.h"
|
|
|
|
#include "upb/reflection/def.h"
|
|
|
|
#include "upb/reflection/message.h"
|
|
|
|
|
|
|
|
// Must be last.
|
|
|
|
#include "upb/port/def.inc"
|
|
|
|
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
|
|
// upb_FieldPath_ToText()
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
char* buf;
|
|
|
|
char* ptr;
|
|
|
|
char* end;
|
|
|
|
size_t overflow;
|
|
|
|
} upb_PrintfAppender;
|
|
|
|
|
|
|
|
UPB_PRINTF(2, 3)
|
|
|
|
static void upb_FieldPath_Printf(upb_PrintfAppender* a, const char* fmt, ...) {
|
|
|
|
size_t n;
|
|
|
|
size_t have = a->end - a->ptr;
|
|
|
|
va_list args;
|
|
|
|
|
|
|
|
va_start(args, fmt);
|
|
|
|
n = _upb_vsnprintf(a->ptr, have, fmt, args);
|
|
|
|
va_end(args);
|
|
|
|
|
|
|
|
if (UPB_LIKELY(have > n)) {
|
|
|
|
// We can't end up here if the user passed (NULL, 0), therefore ptr is known
|
|
|
|
// to be non-NULL, and UPB_PTRADD() is not necessary.
|
|
|
|
assert(a->ptr);
|
|
|
|
a->ptr += n;
|
|
|
|
} else {
|
|
|
|
a->ptr = UPB_PTRADD(a->ptr, have);
|
|
|
|
a->overflow += (n - have);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static size_t upb_FieldPath_NullTerminate(upb_PrintfAppender* d, size_t size) {
|
|
|
|
size_t ret = d->ptr - d->buf + d->overflow;
|
|
|
|
|
|
|
|
if (size > 0) {
|
|
|
|
if (d->ptr == d->end) d->ptr--;
|
|
|
|
*d->ptr = '\0';
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void upb_FieldPath_PutMapKey(upb_PrintfAppender* a,
|
|
|
|
upb_MessageValue map_key,
|
|
|
|
const upb_FieldDef* key_f) {
|
|
|
|
switch (upb_FieldDef_CType(key_f)) {
|
|
|
|
case kUpb_CType_Int32:
|
|
|
|
upb_FieldPath_Printf(a, "[%" PRId32 "]", map_key.int32_val);
|
|
|
|
break;
|
|
|
|
case kUpb_CType_Int64:
|
|
|
|
upb_FieldPath_Printf(a, "[%" PRId64 "]", map_key.int64_val);
|
|
|
|
break;
|
|
|
|
case kUpb_CType_UInt32:
|
|
|
|
upb_FieldPath_Printf(a, "[%" PRIu32 "]", map_key.uint32_val);
|
|
|
|
break;
|
|
|
|
case kUpb_CType_UInt64:
|
|
|
|
upb_FieldPath_Printf(a, "[%" PRIu64 "]", map_key.uint64_val);
|
|
|
|
break;
|
|
|
|
case kUpb_CType_Bool:
|
|
|
|
upb_FieldPath_Printf(a, "[%s]", map_key.bool_val ? "true" : "false");
|
|
|
|
break;
|
|
|
|
case kUpb_CType_String:
|
|
|
|
upb_FieldPath_Printf(a, "[\"");
|
|
|
|
for (size_t i = 0; i < map_key.str_val.size; i++) {
|
|
|
|
char ch = map_key.str_val.data[i];
|
|
|
|
if (ch == '"') {
|
|
|
|
upb_FieldPath_Printf(a, "\\\"");
|
|
|
|
} else {
|
|
|
|
upb_FieldPath_Printf(a, "%c", ch);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
upb_FieldPath_Printf(a, "\"]");
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
UPB_UNREACHABLE(); // Other types can't be map keys.
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
size_t upb_FieldPath_ToText(upb_FieldPathEntry** path, char* buf, size_t size) {
|
|
|
|
upb_FieldPathEntry* ptr = *path;
|
|
|
|
upb_PrintfAppender appender;
|
|
|
|
appender.buf = buf;
|
|
|
|
appender.ptr = buf;
|
|
|
|
appender.end = UPB_PTRADD(buf, size);
|
|
|
|
appender.overflow = 0;
|
|
|
|
bool first = true;
|
|
|
|
|
|
|
|
while (ptr->field) {
|
|
|
|
const upb_FieldDef* f = ptr->field;
|
|
|
|
|
|
|
|
upb_FieldPath_Printf(&appender, first ? "%s" : ".%s", upb_FieldDef_Name(f));
|
|
|
|
first = false;
|
|
|
|
ptr++;
|
|
|
|
|
|
|
|
if (upb_FieldDef_IsMap(f)) {
|
|
|
|
const upb_FieldDef* key_f =
|
|
|
|
upb_MessageDef_Field(upb_FieldDef_MessageSubDef(f), 0);
|
|
|
|
upb_FieldPath_PutMapKey(&appender, ptr->map_key, key_f);
|
|
|
|
ptr++;
|
|
|
|
} else if (upb_FieldDef_IsRepeated(f)) {
|
|
|
|
upb_FieldPath_Printf(&appender, "[%zu]", ptr->array_index);
|
|
|
|
ptr++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Advance beyond terminating NULL.
|
|
|
|
ptr++;
|
|
|
|
*path = ptr;
|
|
|
|
return upb_FieldPath_NullTerminate(&appender, size);
|
|
|
|
}
|
|
|
|
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
|
|
// upb_util_HasUnsetRequired()
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
upb_FieldPathEntry* path;
|
|
|
|
size_t size;
|
|
|
|
size_t cap;
|
|
|
|
} upb_FieldPathVector;
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
upb_FieldPathVector stack;
|
|
|
|
upb_FieldPathVector out_fields;
|
|
|
|
const upb_DefPool* ext_pool;
|
|
|
|
jmp_buf err;
|
|
|
|
bool has_unset_required;
|
|
|
|
bool save_paths;
|
|
|
|
} upb_FindContext;
|
|
|
|
|
|
|
|
static void upb_FieldPathVector_Init(upb_FieldPathVector* vec) {
|
|
|
|
vec->path = NULL;
|
|
|
|
vec->size = 0;
|
|
|
|
vec->cap = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void upb_FieldPathVector_Reserve(upb_FindContext* ctx,
|
|
|
|
upb_FieldPathVector* vec,
|
|
|
|
size_t elems) {
|
|
|
|
if (vec->cap - vec->size < elems) {
|
|
|
|
const int oldsize = vec->cap * sizeof(*vec->path);
|
|
|
|
size_t need = vec->size + elems;
|
|
|
|
vec->cap = UPB_MAX(4, vec->cap);
|
|
|
|
while (vec->cap < need) vec->cap *= 2;
|
|
|
|
const int newsize = vec->cap * sizeof(*vec->path);
|
|
|
|
vec->path = upb_grealloc(vec->path, oldsize, newsize);
|
|
|
|
if (!vec->path) {
|
|
|
|
UPB_LONGJMP(ctx->err, 1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void upb_FindContext_Push(upb_FindContext* ctx, upb_FieldPathEntry ent) {
|
|
|
|
if (!ctx->save_paths) return;
|
|
|
|
upb_FieldPathVector_Reserve(ctx, &ctx->stack, 1);
|
|
|
|
ctx->stack.path[ctx->stack.size++] = ent;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void upb_FindContext_Pop(upb_FindContext* ctx) {
|
|
|
|
if (!ctx->save_paths) return;
|
|
|
|
assert(ctx->stack.size != 0);
|
|
|
|
ctx->stack.size--;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void upb_util_FindUnsetInMessage(upb_FindContext* ctx,
|
|
|
|
const upb_Message* msg,
|
|
|
|
const upb_MessageDef* m) {
|
|
|
|
// Iterate over all fields to see if any required fields are missing.
|
|
|
|
for (int i = 0, n = upb_MessageDef_FieldCount(m); i < n; i++) {
|
|
|
|
const upb_FieldDef* f = upb_MessageDef_Field(m, i);
|
Implement feature inheritance and legacy editions for upb.
This switches upb to using legacy editions for all proto2/proto3 logic. This does not yet enable code generation for editions protos (ie. we do not yet turn on `FEATURE_SUPPORTS_EDITIONS`), but with feature inheritance in place, this will be a much smaller follow-on change.
There is a ~10% increase in allocations, but only a ~1% increase in peak memory. There are some <5% increases in instructions and cycles, but apparently no increase in time:
```
name old cpu/op new cpu/op delta
BM_ArenaOneAlloc 17.8ns ±11% 16.9ns ±17% ~ (p=0.310 n=5+5)
BM_ArenaInitialBlockOneAlloc 5.99ns ±13% 5.35ns ± 2% ~ (p=0.421 n=5+5)
BM_ArenaFuseUnbalanced/2 71.4ns ±11% 63.1ns ± 3% ~ (p=0.095 n=5+5)
BM_ArenaFuseUnbalanced/8 509ns ± 2% 532ns ±15% ~ (p=0.421 n=5+5)
BM_ArenaFuseUnbalanced/64 4.73µs ±20% 4.43µs ±10% ~ (p=0.841 n=5+5)
BM_ArenaFuseUnbalanced/128 9.77µs ±12% 8.64µs ± 4% ~ (p=0.095 n=5+5)
BM_ArenaFuseBalanced/2 67.5ns ±13% 62.6ns ± 3% ~ (p=0.841 n=5+5)
BM_ArenaFuseBalanced/8 552ns ±23% 496ns ±25% ~ (p=0.222 n=5+5)
BM_ArenaFuseBalanced/64 4.76µs ±14% 4.24µs ± 4% ~ (p=0.421 n=5+5)
BM_ArenaFuseBalanced/128 10.2µs ±14% 8.6µs ± 4% -15.61% (p=0.016 n=5+5)
BM_LoadAdsDescriptor_Upb<NoLayout> 6.20ms ±12% 6.18ms ±16% ~ (p=0.421 n=5+5)
BM_LoadAdsDescriptor_Upb<WithLayout> 6.91ms ±12% 6.63ms ± 3% ~ (p=0.690 n=5+5)
BM_LoadAdsDescriptor_Proto2<NoLayout> 15.0ms ±12% 13.7ms ± 3% ~ (p=0.421 n=5+5)
BM_LoadAdsDescriptor_Proto2<WithLayout> 15.1ms ±13% 13.8ms ± 3% ~ (p=0.548 n=5+5)
BM_Parse_Upb_FileDesc<UseArena, Copy> 14.4µs ±13% 13.2µs ± 3% ~ (p=0.548 n=5+5)
BM_Parse_Upb_FileDesc<UseArena, Alias> 12.8µs ±12% 11.8µs ± 3% ~ (p=0.222 n=5+5)
BM_Parse_Upb_FileDesc<InitBlock, Copy> 13.7µs ±12% 12.9µs ± 3% ~ (p=1.000 n=5+5)
BM_Parse_Upb_FileDesc<InitBlock, Alias> 13.1µs ±11% 11.6µs ± 3% ~ (p=0.056 n=5+5)
BM_Parse_Proto2<FileDesc, NoArena, Copy> 24.7µs ±12% 22.6µs ± 8% ~ (p=0.310 n=5+5)
BM_Parse_Proto2<FileDesc, UseArena, Copy> 11.6µs ±13% 10.9µs ± 2% ~ (p=1.000 n=5+5)
BM_Parse_Proto2<FileDesc, InitBlock, Copy> 11.7µs ±10% 10.6µs ± 3% ~ (p=0.310 n=5+5)
BM_Parse_Proto2<FileDescSV, InitBlock, Alias> 13.4µs ±12% 12.3µs ± 4% ~ (p=0.310 n=5+5)
BM_SerializeDescriptor_Proto2 6.62µs ±13% 6.00µs ± 6% ~ (p=0.056 n=5+5)
BM_SerializeDescriptor_Upb 11.1µs ±13% 10.3µs ± 3% ~ (p=1.000 n=5+5)
name old time/op new time/op delta
BM_ArenaOneAlloc 17.9ns ±12% 17.0ns ±17% ~ (p=0.310 n=5+5)
BM_ArenaInitialBlockOneAlloc 6.03ns ±14% 5.36ns ± 2% ~ (p=0.421 n=5+5)
BM_ArenaFuseUnbalanced/2 71.9ns ±12% 63.3ns ± 3% ~ (p=0.095 n=5+5)
BM_ArenaFuseUnbalanced/8 511ns ± 2% 533ns ±15% ~ (p=0.421 n=5+5)
BM_ArenaFuseUnbalanced/64 4.75µs ±20% 4.44µs ±10% ~ (p=0.841 n=5+5)
BM_ArenaFuseUnbalanced/128 9.83µs ±12% 8.66µs ± 4% ~ (p=0.151 n=5+5)
BM_ArenaFuseBalanced/2 67.8ns ±13% 62.7ns ± 3% ~ (p=0.841 n=5+5)
BM_ArenaFuseBalanced/8 555ns ±24% 497ns ±26% ~ (p=0.222 n=5+5)
BM_ArenaFuseBalanced/64 4.79µs ±14% 4.25µs ± 4% ~ (p=0.310 n=5+5)
BM_ArenaFuseBalanced/128 10.3µs ±14% 8.6µs ± 4% -15.93% (p=0.016 n=5+5)
BM_LoadAdsDescriptor_Upb<NoLayout> 6.25ms ±12% 6.20ms ±16% ~ (p=0.421 n=5+5)
BM_LoadAdsDescriptor_Upb<WithLayout> 6.96ms ±13% 6.65ms ± 3% ~ (p=0.690 n=5+5)
BM_LoadAdsDescriptor_Proto2<NoLayout> 15.2ms ±12% 13.7ms ± 3% ~ (p=0.421 n=5+5)
BM_LoadAdsDescriptor_Proto2<WithLayout> 15.3ms ±14% 13.8ms ± 3% ~ (p=0.548 n=5+5)
BM_Parse_Upb_FileDesc<UseArena, Copy> 14.5µs ±14% 13.2µs ± 3% ~ (p=0.690 n=5+5)
BM_Parse_Upb_FileDesc<UseArena, Alias> 12.8µs ±12% 11.8µs ± 3% ~ (p=0.222 n=5+5)
BM_Parse_Upb_FileDesc<InitBlock, Copy> 13.8µs ±13% 13.0µs ± 3% ~ (p=1.000 n=5+5)
BM_Parse_Upb_FileDesc<InitBlock, Alias> 13.2µs ±12% 11.6µs ± 3% ~ (p=0.056 n=5+5)
BM_Parse_Proto2<FileDesc, NoArena, Copy> 24.9µs ±12% 22.6µs ± 8% ~ (p=0.310 n=5+5)
BM_Parse_Proto2<FileDesc, UseArena, Copy> 11.7µs ±14% 10.9µs ± 2% ~ (p=1.000 n=5+5)
BM_Parse_Proto2<FileDesc, InitBlock, Copy> 11.7µs ±11% 10.7µs ± 3% ~ (p=0.222 n=5+5)
BM_Parse_Proto2<FileDescSV, InitBlock, Alias> 13.5µs ±12% 12.3µs ± 4% ~ (p=0.310 n=5+5)
BM_SerializeDescriptor_Proto2 6.65µs ±13% 6.01µs ± 6% ~ (p=0.056 n=5+5)
BM_SerializeDescriptor_Upb 11.2µs ±13% 10.3µs ± 3% ~ (p=1.000 n=5+5)
name old INSTRUCTIONS/op new INSTRUCTIONS/op delta
BM_ArenaOneAlloc 189 ± 0% 189 ± 0% ~ (p=0.881 n=5+5)
BM_ArenaInitialBlockOneAlloc 69.0 ± 0% 69.0 ± 0% ~ (all samples are equal)
BM_ArenaFuseUnbalanced/2 458 ± 0% 458 ± 0% ~ (p=1.000 n=5+5)
BM_ArenaFuseUnbalanced/8 3.28k ±15% 3.60k ± 0% ~ (p=0.286 n=5+4)
BM_ArenaFuseUnbalanced/64 28.6k ± 2% 29.2k ± 0% +2.17% (p=0.032 n=5+4)
BM_ArenaFuseUnbalanced/128 57.9k ± 1% 57.9k ± 1% ~ (p=1.000 n=5+5)
BM_ArenaFuseBalanced/2 482 ± 0% 482 ± 0% ~ (p=0.421 n=5+5)
BM_ArenaFuseBalanced/8 3.35k ±14% 3.35k ±14% ~ (p=0.841 n=5+5)
BM_ArenaFuseBalanced/64 29.2k ± 2% 29.3k ± 1% ~ (p=0.421 n=5+5)
BM_ArenaFuseBalanced/128 59.2k ± 1% 59.3k ± 1% ~ (p=0.556 n=4+5)
BM_LoadAdsDescriptor_Upb<NoLayout> 37.3M ± 0% 38.2M ± 0% +2.39% (p=0.008 n=5+5)
BM_LoadAdsDescriptor_Upb<WithLayout> 40.9M ± 0% 41.7M ± 0% +2.02% (p=0.008 n=5+5)
BM_LoadAdsDescriptor_Proto2<NoLayout> 87.2M ± 0% 88.3M ± 1% +1.25% (p=0.008 n=5+5)
BM_LoadAdsDescriptor_Proto2<WithLayout> 88.0M ± 0% 88.9M ± 1% +1.13% (p=0.016 n=5+5)
BM_Parse_Upb_FileDesc<UseArena, Copy> 154k ± 0% 154k ± 0% ~ (p=1.000 n=5+5)
BM_Parse_Upb_FileDesc<UseArena, Alias> 143k ± 0% 143k ± 0% ~ (p=0.310 n=5+5)
BM_Parse_Upb_FileDesc<InitBlock, Copy> 153k ± 0% 153k ± 0% ~ (p=1.016 n=5+4)
BM_Parse_Upb_FileDesc<InitBlock, Alias> 142k ± 0% 142k ± 0% ~ (p=0.127 n=5+5)
BM_Parse_Proto2<FileDesc, NoArena, Copy> 213k ± 1% 217k ± 5% ~ (p=1.000 n=5+5)
BM_Parse_Proto2<FileDesc, UseArena, Copy> 122k ± 0% 123k ± 0% +0.86% (p=0.008 n=5+5)
BM_Parse_Proto2<FileDesc, InitBlock, Copy> 120k ± 0% 120k ± 0% ~ (p=0.421 n=5+5)
BM_Parse_Proto2<FileDescSV, InitBlock, Alias> 124k ± 0% 124k ± 0% ~ (p=0.587 n=5+5)
BM_SerializeDescriptor_Proto2 63.5k ± 0% 63.5k ± 0% ~ (p=0.278 n=5+5)
BM_SerializeDescriptor_Upb 111k ± 0% 111k ± 0% ~ (p=1.000 n=5+5)
name old CYCLES/op new CYCLES/op delta
BM_ArenaOneAlloc 53.5 ± 0% 53.4 ± 0% ~ (p=0.095 n=5+5)
BM_ArenaInitialBlockOneAlloc 17.5 ± 1% 17.4 ± 0% ~ (p=0.087 n=5+5)
BM_ArenaFuseUnbalanced/2 206 ± 0% 206 ± 0% ~ (p=0.548 n=5+5)
BM_ArenaFuseUnbalanced/8 1.55k ±12% 1.67k ± 1% ~ (p=0.548 n=5+5)
BM_ArenaFuseUnbalanced/64 14.1k ± 8% 14.1k ± 1% ~ (p=0.222 n=5+5)
BM_ArenaFuseUnbalanced/128 28.2k ± 1% 28.3k ± 1% ~ (p=0.548 n=5+5)
BM_ArenaFuseBalanced/2 205 ± 0% 204 ± 0% ~ (p=0.548 n=5+5)
BM_ArenaFuseBalanced/8 1.57k ±12% 1.56k ±12% ~ (p=0.421 n=5+5)
BM_ArenaFuseBalanced/64 13.9k ± 2% 13.9k ± 1% ~ (p=1.000 n=5+5)
BM_ArenaFuseBalanced/128 28.1k ± 1% 28.2k ± 1% ~ (p=0.730 n=4+5)
BM_LoadAdsDescriptor_Upb<NoLayout> 18.7M ± 0% 19.3M ± 1% +3.38% (p=0.008 n=5+5)
BM_LoadAdsDescriptor_Upb<WithLayout> 20.9M ± 0% 21.6M ± 0% +3.09% (p=0.008 n=5+5)
BM_LoadAdsDescriptor_Proto2<NoLayout> 43.4M ± 0% 44.4M ± 1% +2.33% (p=0.008 n=5+5)
BM_LoadAdsDescriptor_Proto2<WithLayout> 44.0M ± 0% 44.9M ± 2% +1.92% (p=0.016 n=5+5)
BM_Parse_Upb_FileDesc<UseArena, Copy> 42.0k ± 1% 43.0k ± 1% +2.32% (p=0.008 n=5+5)
BM_Parse_Upb_FileDesc<UseArena, Alias> 38.2k ± 1% 38.4k ± 0% +0.74% (p=0.032 n=5+5)
BM_Parse_Upb_FileDesc<InitBlock, Copy> 41.6k ± 0% 42.6k ± 1% +2.51% (p=0.008 n=5+5)
BM_Parse_Upb_FileDesc<InitBlock, Alias> 37.6k ± 0% 38.1k ± 0% +1.34% (p=0.008 n=5+5)
BM_Parse_Proto2<FileDesc, NoArena, Copy> 71.9k ± 1% 74.1k ± 6% ~ (p=1.000 n=5+5)
BM_Parse_Proto2<FileDesc, UseArena, Copy> 35.4k ± 1% 35.8k ± 0% +1.10% (p=0.008 n=5+5)
BM_Parse_Proto2<FileDesc, InitBlock, Copy> 34.6k ± 1% 34.9k ± 1% ~ (p=0.095 n=5+5)
BM_Parse_Proto2<FileDescSV, InitBlock, Alias> 40.5k ± 0% 40.0k ± 1% -1.36% (p=0.008 n=5+5)
BM_SerializeDescriptor_Proto2 20.1k ± 1% 19.7k ± 4% ~ (p=0.421 n=5+5)
BM_SerializeDescriptor_Upb 33.7k ± 0% 33.7k ± 0% ~ (p=0.222 n=5+5)
name old allocs/op new allocs/op delta
BM_ArenaOneAlloc 1.00 ± 0% 1.00 ± 0% ~ (all samples are equal)
BM_ArenaFuseUnbalanced/2 2.00 ± 0% 2.00 ± 0% ~ (all samples are equal)
BM_ArenaFuseUnbalanced/8 8.00 ± 0% 8.00 ± 0% ~ (all samples are equal)
BM_ArenaFuseUnbalanced/64 64.0 ± 0% 64.0 ± 0% ~ (all samples are equal)
BM_ArenaFuseUnbalanced/128 128 ± 0% 128 ± 0% ~ (all samples are equal)
BM_ArenaFuseBalanced/2 2.00 ± 0% 2.00 ± 0% ~ (all samples are equal)
BM_ArenaFuseBalanced/8 8.00 ± 0% 8.00 ± 0% ~ (all samples are equal)
BM_ArenaFuseBalanced/64 64.0 ± 0% 64.0 ± 0% ~ (all samples are equal)
BM_ArenaFuseBalanced/128 128 ± 0% 128 ± 0% ~ (all samples are equal)
BM_LoadAdsDescriptor_Upb<NoLayout> 6.21k ± 0% 6.93k ± 0% +11.54% (p=0.008 n=5+5)
BM_LoadAdsDescriptor_Upb<WithLayout> 6.54k ± 0% 6.96k ± 0% +6.34% (p=0.008 n=5+5)
BM_LoadAdsDescriptor_Proto2<NoLayout> 124k ± 0% 124k ± 0% +0.00% (p=0.008 n=5+5)
BM_LoadAdsDescriptor_Proto2<WithLayout> 126k ± 0% 126k ± 0% +0.00% (p=0.008 n=5+5)
BM_Parse_Upb_FileDesc<UseArena, Copy> 7.00 ± 0% 7.00 ± 0% ~ (all samples are equal)
BM_Parse_Upb_FileDesc<UseArena, Alias> 7.00 ± 0% 7.00 ± 0% ~ (all samples are equal)
BM_Parse_Proto2<FileDesc, NoArena, Copy> 709 ± 0% 709 ± 0% ~ (all samples are equal)
BM_Parse_Proto2<FileDesc, UseArena, Copy> 8.00 ± 0% 8.00 ± 0% ~ (all samples are equal)
name old peak-mem(Bytes)/op new peak-mem(Bytes)/op delta
BM_ArenaOneAlloc 328 ± 0% 328 ± 0% ~ (all samples are equal)
BM_ArenaFuseUnbalanced/2 656 ± 0% 656 ± 0% ~ (all samples are equal)
BM_ArenaFuseUnbalanced/8 2.62k ± 0% 2.62k ± 0% ~ (all samples are equal)
BM_ArenaFuseUnbalanced/64 21.0k ± 0% 21.0k ± 0% ~ (all samples are equal)
BM_ArenaFuseUnbalanced/128 42.0k ± 0% 42.0k ± 0% ~ (all samples are equal)
BM_ArenaFuseBalanced/2 656 ± 0% 656 ± 0% ~ (all samples are equal)
BM_ArenaFuseBalanced/8 2.62k ± 0% 2.62k ± 0% ~ (all samples are equal)
BM_ArenaFuseBalanced/64 21.0k ± 0% 21.0k ± 0% ~ (all samples are equal)
BM_ArenaFuseBalanced/128 42.0k ± 0% 42.0k ± 0% ~ (all samples are equal)
BM_LoadAdsDescriptor_Upb<NoLayout> 10.2M ± 0% 10.4M ± 0% +1.15% (p=0.008 n=5+5)
BM_LoadAdsDescriptor_Upb<WithLayout> 10.5M ± 0% 10.5M ± 0% +0.11% (p=0.008 n=5+5)
BM_LoadAdsDescriptor_Proto2<NoLayout> 7.14M ± 0% 7.14M ± 0% ~ (p=0.317 n=4+5)
BM_LoadAdsDescriptor_Proto2<WithLayout> 7.18M ± 0% 7.18M ± 0% ~ (p=0.159 n=5+4)
BM_Parse_Upb_FileDesc<UseArena, Copy> 36.5k ± 0% 36.5k ± 0% ~ (all samples are equal)
BM_Parse_Upb_FileDesc<UseArena, Alias> 36.5k ± 0% 36.5k ± 0% ~ (all samples are equal)
BM_Parse_Proto2<FileDesc, NoArena, Copy> 35.4k ± 0% 35.4k ± 0% ~ (all samples are equal)
BM_Parse_Proto2<FileDesc, UseArena, Copy> 65.3k ± 0% 65.3k ± 0% ~ (all samples are equal)
name old items/s new items/s delta
BM_ArenaFuseUnbalanced/2 28.2M ±12% 31.7M ± 3% ~ (p=0.095 n=5+5)
BM_ArenaFuseUnbalanced/8 15.7M ± 2% 15.1M ±14% ~ (p=0.421 n=5+5)
BM_ArenaFuseUnbalanced/64 13.7M ±18% 14.5M ± 9% ~ (p=0.841 n=5+5)
BM_ArenaFuseUnbalanced/128 13.2M ±12% 14.8M ± 5% ~ (p=0.095 n=5+5)
BM_ArenaFuseBalanced/2 29.9M ±12% 32.0M ± 3% ~ (p=0.841 n=5+5)
BM_ArenaFuseBalanced/8 14.8M ±28% 16.5M ±22% ~ (p=0.222 n=5+5)
BM_ArenaFuseBalanced/64 13.6M ±15% 15.1M ± 4% ~ (p=0.421 n=5+5)
BM_ArenaFuseBalanced/128 12.6M ±15% 14.9M ± 4% +17.88% (p=0.016 n=5+5)
name old speed new speed delta
BM_LoadAdsDescriptor_Upb<NoLayout> 128MB/s ±11% 128MB/s ±14% ~ (p=0.421 n=5+5)
BM_LoadAdsDescriptor_Upb<WithLayout> 115MB/s ±12% 119MB/s ± 3% ~ (p=0.690 n=5+5)
BM_LoadAdsDescriptor_Proto2<NoLayout> 52.9MB/s ±12% 57.6MB/s ± 3% ~ (p=0.421 n=5+5)
BM_LoadAdsDescriptor_Proto2<WithLayout> 52.6MB/s ±14% 57.2MB/s ± 2% ~ (p=0.548 n=5+5)
BM_Parse_Upb_FileDesc<UseArena, Copy> 527MB/s ±14% 571MB/s ± 3% ~ (p=0.548 n=5+5)
BM_Parse_Upb_FileDesc<UseArena, Alias> 595MB/s ±11% 640MB/s ± 3% ~ (p=0.222 n=5+5)
BM_Parse_Upb_FileDesc<InitBlock, Copy> 553MB/s ±12% 582MB/s ± 3% ~ (p=1.000 n=5+5)
BM_Parse_Upb_FileDesc<InitBlock, Alias> 576MB/s ±12% 649MB/s ± 3% ~ (p=0.056 n=5+5)
BM_Parse_Proto2<FileDesc, NoArena, Copy> 307MB/s ±13% 334MB/s ± 8% ~ (p=0.310 n=5+5)
BM_Parse_Proto2<FileDesc, UseArena, Copy> 653MB/s ±13% 689MB/s ± 2% ~ (p=1.000 n=5+5)
BM_Parse_Proto2<FileDesc, InitBlock, Copy> 650MB/s ±10% 708MB/s ± 3% ~ (p=0.310 n=5+5)
BM_Parse_Proto2<FileDescSV, InitBlock, Alias> 564MB/s ±12% 614MB/s ± 4% ~ (p=0.310 n=5+5)
BM_SerializeDescriptor_Proto2 1.15GB/s ±12% 1.25GB/s ± 5% ~ (p=0.056 n=5+5)
BM_SerializeDescriptor_Upb 684MB/s ±12% 730MB/s ± 3% ~ (p=1.000 n=5+5)
```
This adds about 5Ki of code size. Some of this likely comes from the fact that we now link in `message/copy.c` to perform a deep copy of a FeatureSet proto.
```
$ /google/bin/releases/protobuf-team/bloaty/bloaty-google3-diff --blaze-build-opts="-c opt" third_party/upb/upb/conformance/conformance_upb
FILE SIZE VM SIZE
-------------- --------------
+0.5% +4.19Ki +0.5% +4.19Ki .text
+0.4% +656 +0.4% +656 .rodata
+0.1% +504 [ = ] 0 .strtab
+0.2% +384 [ = ] 0 .symtab
+0.2% +280 +0.2% +280 .eh_frame
+0.2% +216 +0.2% +216 .rela.dyn
+0.3% +96 +0.3% +96 .data.rel.ro
+0.2% +64 +0.2% +64 .eh_frame_hdr
+1.1% +16 [ = ] 0 .got.plt
+0.2% +8 +0.2% +8 .rela.plt
-4.6% -8 -4.6% -8 [LOAD #2 [RX]]
-50.0% -48 [ = ] 0 [Unmapped]
[ = ] 0 -81.7% -1.47Ki .relro_padding
+0.1% +6.30Ki +0.0% +4.00Ki TOTAL
```
PiperOrigin-RevId: 579321454
1 year ago
|
|
|
if (!upb_FieldDef_IsRequired(f)) continue;
|
|
|
|
|
|
|
|
if (!msg || !upb_Message_HasFieldByDef(msg, f)) {
|
|
|
|
// A required field is missing.
|
|
|
|
ctx->has_unset_required = true;
|
|
|
|
|
|
|
|
if (ctx->save_paths) {
|
|
|
|
// Append the contents of the stack to the out array, then
|
|
|
|
// NULL-terminate.
|
|
|
|
upb_FieldPathVector_Reserve(ctx, &ctx->out_fields, ctx->stack.size + 2);
|
|
|
|
if (ctx->stack.size) {
|
|
|
|
memcpy(&ctx->out_fields.path[ctx->out_fields.size], ctx->stack.path,
|
|
|
|
ctx->stack.size * sizeof(*ctx->stack.path));
|
|
|
|
}
|
|
|
|
ctx->out_fields.size += ctx->stack.size;
|
|
|
|
ctx->out_fields.path[ctx->out_fields.size++] =
|
|
|
|
(upb_FieldPathEntry){.field = f};
|
|
|
|
ctx->out_fields.path[ctx->out_fields.size++] =
|
|
|
|
(upb_FieldPathEntry){.field = NULL};
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void upb_util_FindUnsetRequiredInternal(upb_FindContext* ctx,
|
|
|
|
const upb_Message* msg,
|
|
|
|
const upb_MessageDef* m) {
|
|
|
|
// OPT: add markers in the schema for where we can avoid iterating:
|
|
|
|
// 1. messages with no required fields.
|
|
|
|
// 2. messages that cannot possibly reach any required fields.
|
|
|
|
|
|
|
|
upb_util_FindUnsetInMessage(ctx, msg, m);
|
|
|
|
if (!msg) return;
|
|
|
|
|
|
|
|
// Iterate over all present fields to find sub-messages that might be missing
|
|
|
|
// required fields. This may revisit some of the fields already inspected
|
|
|
|
// in the previous loop. We do this separately because this loop will also
|
|
|
|
// find present extensions, which the previous loop will not.
|
|
|
|
//
|
|
|
|
// TODO: consider changing upb_Message_Next() to be capable of
|
|
|
|
// visiting extensions only, for example with a kUpb_Message_BeginEXT
|
|
|
|
// constant.
|
|
|
|
size_t iter = kUpb_Message_Begin;
|
|
|
|
const upb_FieldDef* f;
|
|
|
|
upb_MessageValue val;
|
|
|
|
while (upb_Message_Next(msg, m, ctx->ext_pool, &f, &val, &iter)) {
|
|
|
|
// Skip non-submessage fields.
|
|
|
|
if (!upb_FieldDef_IsSubMessage(f)) continue;
|
|
|
|
|
|
|
|
upb_FindContext_Push(ctx, (upb_FieldPathEntry){.field = f});
|
|
|
|
const upb_MessageDef* sub_m = upb_FieldDef_MessageSubDef(f);
|
|
|
|
|
|
|
|
if (upb_FieldDef_IsMap(f)) {
|
|
|
|
// Map field.
|
|
|
|
const upb_FieldDef* val_f = upb_MessageDef_Field(sub_m, 1);
|
|
|
|
const upb_MessageDef* val_m = upb_FieldDef_MessageSubDef(val_f);
|
|
|
|
if (!val_m) continue;
|
|
|
|
const upb_Map* map = val.map_val;
|
|
|
|
size_t iter = kUpb_Map_Begin;
|
|
|
|
upb_MessageValue key, map_val;
|
|
|
|
while (upb_Map_Next(map, &key, &map_val, &iter)) {
|
|
|
|
upb_FindContext_Push(ctx, (upb_FieldPathEntry){.map_key = key});
|
|
|
|
upb_util_FindUnsetRequiredInternal(ctx, map_val.msg_val, val_m);
|
|
|
|
upb_FindContext_Pop(ctx);
|
|
|
|
}
|
|
|
|
} else if (upb_FieldDef_IsRepeated(f)) {
|
|
|
|
// Repeated field.
|
|
|
|
const upb_Array* arr = val.array_val;
|
|
|
|
for (size_t i = 0, n = upb_Array_Size(arr); i < n; i++) {
|
|
|
|
upb_MessageValue elem = upb_Array_Get(arr, i);
|
|
|
|
upb_FindContext_Push(ctx, (upb_FieldPathEntry){.array_index = i});
|
|
|
|
upb_util_FindUnsetRequiredInternal(ctx, elem.msg_val, sub_m);
|
|
|
|
upb_FindContext_Pop(ctx);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// Scalar sub-message field.
|
|
|
|
upb_util_FindUnsetRequiredInternal(ctx, val.msg_val, sub_m);
|
|
|
|
}
|
|
|
|
|
|
|
|
upb_FindContext_Pop(ctx);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
bool upb_util_HasUnsetRequired(const upb_Message* msg, const upb_MessageDef* m,
|
|
|
|
const upb_DefPool* ext_pool,
|
|
|
|
upb_FieldPathEntry** fields) {
|
|
|
|
upb_FindContext ctx;
|
|
|
|
ctx.has_unset_required = false;
|
|
|
|
ctx.save_paths = fields != NULL;
|
|
|
|
ctx.ext_pool = ext_pool;
|
|
|
|
upb_FieldPathVector_Init(&ctx.stack);
|
|
|
|
upb_FieldPathVector_Init(&ctx.out_fields);
|
|
|
|
upb_util_FindUnsetRequiredInternal(&ctx, msg, m);
|
|
|
|
upb_gfree(ctx.stack.path);
|
|
|
|
|
|
|
|
if (ctx.has_unset_required && fields) {
|
|
|
|
upb_FieldPathVector_Reserve(&ctx, &ctx.out_fields, 1);
|
|
|
|
ctx.out_fields.path[ctx.out_fields.size] =
|
|
|
|
(upb_FieldPathEntry){.field = NULL};
|
|
|
|
*fields = ctx.out_fields.path;
|
|
|
|
}
|
|
|
|
|
|
|
|
return ctx.has_unset_required;
|
|
|
|
}
|