|
|
|
// Copyright (c) 2009-2021, Google LLC
|
|
|
|
// All rights reserved.
|
|
|
|
//
|
|
|
|
// Redistribution and use in source and binary forms, with or without
|
|
|
|
// modification, are permitted provided that the following conditions are met:
|
|
|
|
// * Redistributions of source code must retain the above copyright
|
|
|
|
// notice, this list of conditions and the following disclaimer.
|
|
|
|
// * Redistributions in binary form must reproduce the above copyright
|
|
|
|
// notice, this list of conditions and the following disclaimer in the
|
|
|
|
// documentation and/or other materials provided with the distribution.
|
|
|
|
// * Neither the name of Google LLC nor the
|
|
|
|
// names of its contributors may be used to endorse or promote products
|
|
|
|
// derived from this software without specific prior written permission.
|
|
|
|
//
|
|
|
|
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
|
|
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
|
|
// ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
|
|
|
|
// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
|
|
// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
|
|
// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
|
|
// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
|
|
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
|
|
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
Squashed 'third_party/upb/' changes from 382d5afc60..60607da72e
60607da72e Merge pull request #356 from haberman/codegen-uniquefiles
7a54a5f3d6 Split the code generators for .upb and .upbdefs.
b10b02f66f Merge pull request #353 from haberman/small-fixes
cd7c2d2701 Merge pull request #352 from haberman/large-field-number
10b355a6e0 A couple minor fixes. These are exercised by Ruby.
6c30b5fe73 Fixed upb encoder for field numbers > 2**28.
31b3528424 Merge pull request #350 from haberman/encode-depthlimit
e9551022c1 Added depth limit checking to upb_encode().
f389384c5a Merge pull request #349 from lidizheng/json-public
f72c26cbc4 Make :json publically visible
5797d95172 Merge pull request #348 from haberman/json-emit-defaults
7a17493269 Removed print debugging.
695b7f4617 Added code to test UPB_JSONENC_EMITDEFAULTS.
6b357607bd Fixed bugs in JSON encoding with UPB_JSONENC_EMITDEFAULTS.
1b08391979 Merge pull request #347 from haberman/filedef-symtab
ee49a8d7df Added an accessor to get the symtab from a filedef.
a81b47025a Merge pull request #345 from haberman/encode-skipunknown
6535cbe380 Merge pull request #346 from timgates42/bugfix_typo_position
7225108720 docs: fix simple typo, posisiton -> position
871ff96252 Test SKIPUNKNOWN on regular fields.
0569c22a1e Removed debug print.
76764643ac Added option to binary encoder to skip unknown fields.
794ce6d061 Merge pull request #344 from haberman/deterministic-serialize
a04627abc8 Added map sorting to binary and text encoders.
3e071ea91a Merge pull request #343 from haberman/msvc
e70e488e09 MSVC apparently doesn't support the standard C/C++ defines.
963e501aa6 Merge pull request #342 from haberman/fuzz
8d670d8aea Renamed decode_varint32() to decode_tag().
9abf8e043f Clamp 32-bit varints to 5 bytes to fix a fuzz failure.
50a543de7f Merge pull request #341 from haberman/code-size
9c87f1168f Added size benchmark for CODE_SIZE.
6f82028236 Merge pull request #340 from haberman/darwin-setjmp
358fa14d0e Fixed headers and updated benchmark script.
bc200451ce Use a macro instead of an inline function for setjmp/longjmp.
ca279f8afa Merge branch 'master' into darwin-setjmp
fbc0639b07 Use _setjmp on mac to avoid saving/restoring the signal mask.
10f0a38450 Merge pull request #337 from haberman/size-benchmarks
4be07a2dce Increase build timeout until we can parallelize the build.
378a27b640 Force "size" to run locally.
da48e01f05 More google3 fixes.
d2446fd2db Moved cc_api_version attribute to proto_library().
4a84390c89 Added cc_proto_library() tweaks for google3.
4dd4212a34 Merge branch 'master' into size-benchmarks
ffecfef161 Merge branch 'master' into size-benchmarks
86f671d5fd Fix for Darwin (output is different, but it won't error out).
165e01ec6f Fix for old Python versions.
40fdff5e43 Merge pull request #339 from haberman/benchmark-alias
5f8bb5de1d Updated generated code.
65d166a6ba Added API for copy vs. alias and added benchmarks to test both.
27b9c999a7 Merge pull request #338 from haberman/arena-initial
9df96874e9 Start arena block doubling at initial block size.
881ddac7fe Also use .format() for gen_synthetic_protos.py.
8b7dabe1a2 Use format() instead of string interpolation, for old Python versions.
8e08282c3b Removed unused small.proto.
0f79d47215 Added missing lite binaries to size_data.txt.
555fbbc0bc Size benchmarks are working pretty well.
85cbc41a89 Merge branch 'master' into size-benchmarks
e5bdfba92c Removed accidentally-added .orig file.
07851fac58 Merge pull request #336 from haberman/fuzz
982b634bc5 Fixed a few minor bugs found by fuzzing.
c9d2e58480 Merge pull request #310 from haberman/fast-table
a01f3e23a4 Fixes for google3 build, and exclude even more tests from macOS to avoid timeout.
a83d55ee4b Exclude Clang tests from MacOS to avoid Kokoro timeouts.
73fcfe9ed0 Tried to slim down the tests a bit more.
baab25b7aa Removed excess/redundant tests from Kokoro script.
1eb7bd39e7 Some formatting fixes.
9d87055ce4 Updated Kokoro build script.
4bd34da105 WIP.
a7993615bf Merge branch 'master' into fast-table
3a3efe69a2 Added incompatible_use_toolchain_transition = True per https://github.com/bazelbuild/bazel/issues/11584
7b4e376f79 Switch unordered_set -> absl::flat_hash_set.
fe62fc83e1 Removed obsolete includes in benchmark.
5ed089dc42 Merge pull request #335 from haberman/wyhash-rule
e9b79542ad Added a BUILD file for wyhash.
7b8ae7ec4e Merge branch 'master' into size-benchmarks
a5b5445da6 Merge pull request #334 from haberman/rm-port-c
6c16cba83f Removed obsolete port.c file.
484d8f746a Updated comment in wyhash.h to correct spelling mistake.
6a9d0f45b8 Merge pull request #333 from haberman/32bitfixes
5b1f0d86a1 For Kokoro, only build/test -m32 on Linux.
0497f8deed Fixed a critical bug on 32-bit builds, and added much more Kokoro testing.
7543f851f1 Merge pull request #332 from haberman/php-amalgamation
64abb5eb11 Amalgamation no longer bundles wyhash, but #includes it.
a2a40792b5 Merge pull request #331 from haberman/json-oneof-fix
dd0994d377 Bugfix for JSON decoding: only check real oneofs for duplicates.
496f638025 Merge pull request #330 from haberman/symtab-longjmp
c9f9668234 symtab: use longjmp() for errors and avoid intermediate table.
4d9a8cd67b Merge branch 'master' into symtab-longjmp
6322d1d72d Merge pull request #329 from haberman/benchmark-ads-descriptor
5ec1d39224 Avoid building .pb.cc for ads protos, as C++ takes forever to compile.
43c207ea7e Added CMake dummy rule.
c3b5637646 Added benchmark for loading ads descriptor.
acd72c6d3f WIP.
6ae3b66cd2 Merge pull request #328 from haberman/optdefload
8113ebd6c7 Added explanatory comment about integer constants.
f2d826b9f3 Got rid of floating-point division in table init.
723cd8ffc1 Added wyhash code and LICENSE, and removed temporary benchmark.
15e20636c3 Merge branch 'master' into optdefload
154f2c25f4 Added UTF-8 validation for proto3 string fields.
e8f9eac68c Added #defines UPB_ENABLE_FASTTABLE and UPB_TRY_ENABLE_FASTTABLE.
994cf07cf3 Merge pull request #327 from benjaminp/modern-linking
b5bd5807a7 Migrate to modern Starlark linking api.
dc64613607 Merge branch 'fastest-table' into fast-table
e86541ac1d Fixed the build after the merge.
1cd0cb17d3 Merge branch 'master' into fastest-table
901744a97e Merge pull request #326 from haberman/c99
a0d16e7073 Added a few missing copts, and made some functions proper prototypes.
558315a1c3 Added COPTS to :port.
7e5bd65098 Plumbed copts (including the crucial -std=c99) to upb_proto_library() aspect.
8f3ee80d46 Drop C89/C90 support and MSVC prior to Visual Studio 2015.
a274ad786a Plumbed copts (including the crucial -std=c99) to upb_proto_library() aspect.
2c8bb6dd9d Specify C99 explicitly until/unless we stop using bool.
efd576b698 Added -std=gnu99 for fastdecode and ran Buildifier.
b928696942 A few more fixes, and test fastdecode under Kokoro.
55f3569cd2 A few minor fixes and more assertions.
8b38e8f214 Merge branch 'fastest-table' into fast-table
46eb82467a Added comment to decode_fast.h.
bd9f8f580d Fixed a few bugs with the fast decoder.
3eba47914b Allocate hasbits and table slots in "hotness" order.
021db6fcd5 Allow larger tags into the table if they are unique mod 31.
86d9908c55 Fastdecode support for packed fields.
e3e797b680 Added fasttable support for oneofs.
7ffa9c181a Fixed some small bugs and performance problems in string copying.
e2c709e047 Repeated string and primitive support.
e9103eda9e Merge branch 'master' into fastest-table
0756999ab6 Merge pull request #325 from haberman/inlined-arena
25db40bc30 Fixed upb::InlinedArena, which was compeltely broken.
d81ba58215 Optimized short string copying.
f3a2a79349 More optimization, back up to 2.56GB/s.
199c914295 Simplify push/pop when msg fits in the current buffer.
d5f5db2729 Put string-copying field parser into a separate function.
883f20d4dc Merge branch 'master' into fastest-table
1bd62e8218 Merge pull request #324 from haberman/simplemomi
f4adbe0698 Optimized varint decoding from Gerben.
48689df72e Eliminated bounds checks inside parsing a field.
a345af9883 Added a codegen parameter for whether fasttables are generated or not.
8a3470c543 WIP.
8e8dbb5258 Merge branch 'fastest-table' into fast-table
7d17a0e8c5 Merge branch 'master' into fastest-table
a7e2e8338d Fixed benchmark script.
72de7b7002 Merge branch 'fastest-table' into fast-table
cb234e652c Merge branch 'master' into fastest-table
b86cf2d789 Merge pull request #323 from haberman/build-files
4ea81ab107 Fixed pedantic warning.
6399b31f4b Removed ULL constants in json_decode.c.
c8ae197e64 Removed "U" suffixes, they are not necessary.
bc1e0b314f Fixed some strict C89 errors.
2c1664906a Removed license comments and upb_amalgamation for google3.
b7dc77415a Added licenses() to all BUILD files.
de22764b33 Updated Kokoro to test ... instead of :all.
e3f41de6c7 Split monolithic BUILD file into many build files.
fbe2bcafbc Merge pull request #4 from gerben-s/gerbens-fast-table
9e68ec033f Add repeated varints and fixed parsers
d0e4b688c6 Shorten name of kAliasString, so benchmark results don't wrap.
c0c9b5a168 Regenerated generated code.
eb8e6de8b7 Regenerated source files.
7f0d535826 Merge branch 'fastest-table' into fast-table
bf8e08074c Added a few more comments.
6e3c22e6ee Merge branch 'fastest-table' into fast-table
3238821315 Gave fast table entry a nicer name.
2a574d3d01 Added a bunch of comments for readability.
0deca8b8fb Merge branch 'master' into fast-table
bfadc99709 Merge branch 'master' into fastest-table
84e0f6127d Merge branch 'master' into fastest-table
61c51a607b Merge branch 'master' into fast-table
4f066765a9 Merge pull request #320 from haberman/string-view-benchmark
bf393bf086 Cleaned up benchmark names.
9eb8414b31 Added descriptor_sv.proto.
ee7da95367 Bzl formatting fix per buildifier.
de1b6b0718 Refactored proto2 benchmarks and added StringView benchmark.
c2901eeee1 Added missing #includes (caught by Blaze).
52721eadc7 Order LargeInitialBlock after non-initial-block test.
44a7130845 Used the correct copy of the protos in the benchmark.
3a242e7a48 Merge branch 'master' into fast-table
d01b712dbb Merge branch 'master' into fastest-table
d225dfc2ed Buildifier formatting fixes.
b0994a6501 Added missing dep from benchmark.
de80054018 Make required fields optional for benchmarking.
745661bf1f Merge branch 'master' into fastest-table
11585095b7 Merge pull request #319 from haberman/copy-descriptor
fd5a35d49d Minor comment changes.
bdd1a516e8 Fixed other tests.
27262adf93 Snapshot descriptor.proto into our own copy for benchmarking purposes.
d6b40fd5e2 Added missing dependency on reflection.
b9f1b67d07 Use quoted include.
1c8c16b9b1 Use quoted include.
4f901b6430 Passes all tests.
de84e20788 Merge branch 'master' into optdefload
d5c64476fd Merge pull request #318 from haberman/descriptor-load-benchmark
42d2f6cef9 Add MB/s measures in the benchmarks.
1ce98b86ec Added LoadDescriptor benchmark for proto2.
4890735ce2 Added benchmark for descriptor loading.
6f59f1256e Optimizations to descriptor loading.
6874d61704 Merge pull request #317 from haberman/gencode-compat
c81113e60f Added fallback code for when no enum matches.
c10b24ffb2 Simplified switch().
ded2e657a7 Added compatibility with old generated code.
5b0c5c7d4a Dispatch inline.
75edd3e59c Changed to use table pairs, seems to ever-so-slightly regress.
69d99a247e Merge pull request #3 from haberman/shifted-table
bca7edac8c Cleaned up table compression a bit.
b95f217996 A little speed boost, now hitting 2.51GB/s.
8ed6b2fe85 Stored mask in the table pointer.
a6dc88556d Tables are compressed, but perf goes down to 2.44GB/s.
91eb09b1bc Add a few comments.
7a1835d7c3 Merge branch 'master' into fast-table
8bd5c0088e Merge pull request #316 from haberman/submsg-array
a4966fd230 Added a few extra sanity checks.
99acbe0da8 Fixed bug where submsg array could have excess elements.
2a0425ecf5 Merge pull request #315 from haberman/conformance-fixes
7ccf5650c7 If we encounter "null" for a non-NullValue enum, throw an error.
0a3a94a12f Updated to a new version of protobuf and fixed a few conformance tests.
ddd5f28c4f Merge branch 'is_bazel'
10fa3a0c77 Merge pull request #314 from haberman/addunknown
504e105420 undef UPB_ASAN.
ab96d1ec41 Removed extraneous C++-style comment.
d5096f9ee8 Fixed bug in addunknown and added ASAN poisoning.
6fe84526be Mark _is_bazel to be replace in google3.
f01efe8b64 Removed another C99-ism.
1749082bbb Removed C99-ism.
147e363f56 Merge branch 'master' into fast-table
f2ddc15d76 Bugfix: initialize fastlimit and fastend.
65e49b694b Merge branch 'gerben-fast-table' into fast-table
1abf7d418d Added generated files.
3f719fa6b2 Bugfix: offsetting hasbits with 16 introduced a bug in calculating hasmasks. Removing extra <<16 shift in hasmask calculating and masking out the first 16 bits. This makes messages without hasbits work as well.
aec762e405 Merge branch 'master' into fast-table
4f77aaafd8 Merge pull request #2 from gerben-s/fast-table
4053805759 Bugfixes
d1cd80385b Merge pull request #313 from haberman/inline-arena
ad21083623 Merge pull request #313 from haberman/inline-arena
2339fc779c Updated obsolete comment.
b393849bbd Updated obsolete comment.
ebe53f8590 Fixed compile error.
b37f82b58b Fixed compile error.
71749b7caf Implemented inline array allocation, and moved type->lg2 map to reflection.
9557b97acc Implemented inline array allocation, and moved type->lg2 map to reflection.
b58d2a0ee6 Shrink overhead of message representation.
0bf063a2ca Shrink overhead of message representation.
d87ceeacab Shave off one more store.
ddc52ab9d6 Shave off one more store.
c25d895adf Shrunk the arena state that needs to be synced.
7f67f68c1c Shrunk the arena state that needs to be synced.
ff40dd6ea9 Added new internal header.
85a43e5461 Added new internal header.
36662b3735 Refactor some code. I extracted some common code from all message field parsers, to a tail recursive function. Removed the varint jmp table for a simple varint parse loop, that removes the stack frames. Also careful with not losing information in repeated message tag check. When written mindful the checks and loads that happen can be reused for tag dispatch if not the expected tag.
cbcd635917 Fixed memory leak.
bcbcdadbd2 Fixed memory leak.
e5264bd794 Merge pull request #312 from haberman/defiter
52957fa984 Merge pull request #312 from haberman/defiter
746f64692c Moved arena inline for decoder.
7363b91ac3 Moved arena inline for decoder.
b8ef1dcc57 Removed C++-style comments.
575acd85bd Re-added const for all of the pointer wrapper types.
5aa5b77b41 Added simple offset-based accessors for defs, and deprecated old iterators.
33384301e2 Merge pull request #311 from haberman/proto2-benchmark2
578e7c1f4c Merge pull request #311 from haberman/proto2-benchmark2
bc301e7da4 Use merge/partial variants to give proto2 benchmark the fairest hearing.
30f01afa83 Added LargeInitialBlock test for proto2.
5d23fd99af Used shorter protobuf:: namespace alias.
9938cf8f27 Put submsg_index directly in table data. Drop oneof support for now to focus.
d87179501d Another build fix.
89bd8b87e1 Fixed a few more C89 compat issues.
64d293894a Fixed bug introduced by last optimization.
ff957b996c Fixed C89 compat issues.
537b6f42c2 A few updates to the benchamrk and minor implementation changes.
0dcc5641eb Replicated dispatch and implemeted array resizing logic. Up to 2.67GB/s.
526e430794 I think this may have reached the optimization limit.
4c65b25daf Handle long varints, now 2GB/s!
e39ec95ca2 Hoisted updates to limits and depth out of the loop.
52a0ed3891 Fixed a bug with tag number 15.
388b6f64eb A small optimization: don't increment array length every iteration.
9e5c5ce089 Optimized memset() with cutoff and fixed group & unknown message bugs.
8dd7b5a2ca A bunch more optimization.
e46e94ec7f Added benchmarks for proto2.
405e7934b1 Handle 2-byte submessage lengths.
88b1ec7784 Table-driven supports repeated sub-messages.
f173642db4 Handle non-repeated submessages.
e219a2d91d Merge branch 'decode-arena' into fast-table
7ec2c52346 Donate/steal from arena to accelerate decoding.
d43ccfa079 Revert test changes.
fac992db83 Cleanup for showing.
3937874a85 We have a properly structured algorithm, but perf regresses by 20%.
438ecaeb5a Give all field parsers a generic table entry.
383ae5293e WIP.
26abaa2345 WIP.
34b98bc030 Avoid passing too many params to fallback.
763a3f6293 WIP.
02ff6fb996 Merge pull request #309 from haberman/decoder-forceinline
a202ce9629 Add UPB_FORCEINLINE for varint32 decoding.
d0f2c4c8a2 Merge pull request #308 from haberman/encoder
5741eb9ad7 Expanded benchmarking script and added one size opt to the encoder.
0135399e60 Fixed bug introduced in refactoring.
df3438222b Notated impossible branch as unreachable.
9b31e8fe12 Merged common encode tag paths.
5d7dc718cc Minor formatting fix.
80441e4eb4 Optimized binary encoder.
ada28896b9 Changed encoder to use longjmp() for error recovery.
6e140c267c Added benchmark for encoding.
7338facddb Merge pull request #307 from veblush/port-backport
4d2251c3e4 Add UPB_NORETURN for MSC
git-subtree-dir: third_party/upb
git-subtree-split: 60607da72e89ba0c84c84054d2e562d8b6b61177
4 years ago
|
|
|
|
|
|
|
#include <memory>
|
|
|
|
|
|
|
|
#include "google/protobuf/compiler/code_generator.h"
|
|
|
|
#include "google/protobuf/compiler/plugin.h"
|
|
|
|
#include "google/protobuf/descriptor.h"
|
|
|
|
#include "google/protobuf/descriptor.pb.h"
|
|
|
|
#include "upbc/common.h"
|
|
|
|
|
|
|
|
namespace upbc {
|
|
|
|
namespace {
|
|
|
|
|
|
|
|
namespace protoc = ::google::protobuf::compiler;
|
|
|
|
namespace protobuf = ::google::protobuf;
|
|
|
|
|
|
|
|
std::string DefInitSymbol(const protobuf::FileDescriptor* file) {
|
Squashed 'third_party/upb/' changes from 382d5afc60..60607da72e
60607da72e Merge pull request #356 from haberman/codegen-uniquefiles
7a54a5f3d6 Split the code generators for .upb and .upbdefs.
b10b02f66f Merge pull request #353 from haberman/small-fixes
cd7c2d2701 Merge pull request #352 from haberman/large-field-number
10b355a6e0 A couple minor fixes. These are exercised by Ruby.
6c30b5fe73 Fixed upb encoder for field numbers > 2**28.
31b3528424 Merge pull request #350 from haberman/encode-depthlimit
e9551022c1 Added depth limit checking to upb_encode().
f389384c5a Merge pull request #349 from lidizheng/json-public
f72c26cbc4 Make :json publically visible
5797d95172 Merge pull request #348 from haberman/json-emit-defaults
7a17493269 Removed print debugging.
695b7f4617 Added code to test UPB_JSONENC_EMITDEFAULTS.
6b357607bd Fixed bugs in JSON encoding with UPB_JSONENC_EMITDEFAULTS.
1b08391979 Merge pull request #347 from haberman/filedef-symtab
ee49a8d7df Added an accessor to get the symtab from a filedef.
a81b47025a Merge pull request #345 from haberman/encode-skipunknown
6535cbe380 Merge pull request #346 from timgates42/bugfix_typo_position
7225108720 docs: fix simple typo, posisiton -> position
871ff96252 Test SKIPUNKNOWN on regular fields.
0569c22a1e Removed debug print.
76764643ac Added option to binary encoder to skip unknown fields.
794ce6d061 Merge pull request #344 from haberman/deterministic-serialize
a04627abc8 Added map sorting to binary and text encoders.
3e071ea91a Merge pull request #343 from haberman/msvc
e70e488e09 MSVC apparently doesn't support the standard C/C++ defines.
963e501aa6 Merge pull request #342 from haberman/fuzz
8d670d8aea Renamed decode_varint32() to decode_tag().
9abf8e043f Clamp 32-bit varints to 5 bytes to fix a fuzz failure.
50a543de7f Merge pull request #341 from haberman/code-size
9c87f1168f Added size benchmark for CODE_SIZE.
6f82028236 Merge pull request #340 from haberman/darwin-setjmp
358fa14d0e Fixed headers and updated benchmark script.
bc200451ce Use a macro instead of an inline function for setjmp/longjmp.
ca279f8afa Merge branch 'master' into darwin-setjmp
fbc0639b07 Use _setjmp on mac to avoid saving/restoring the signal mask.
10f0a38450 Merge pull request #337 from haberman/size-benchmarks
4be07a2dce Increase build timeout until we can parallelize the build.
378a27b640 Force "size" to run locally.
da48e01f05 More google3 fixes.
d2446fd2db Moved cc_api_version attribute to proto_library().
4a84390c89 Added cc_proto_library() tweaks for google3.
4dd4212a34 Merge branch 'master' into size-benchmarks
ffecfef161 Merge branch 'master' into size-benchmarks
86f671d5fd Fix for Darwin (output is different, but it won't error out).
165e01ec6f Fix for old Python versions.
40fdff5e43 Merge pull request #339 from haberman/benchmark-alias
5f8bb5de1d Updated generated code.
65d166a6ba Added API for copy vs. alias and added benchmarks to test both.
27b9c999a7 Merge pull request #338 from haberman/arena-initial
9df96874e9 Start arena block doubling at initial block size.
881ddac7fe Also use .format() for gen_synthetic_protos.py.
8b7dabe1a2 Use format() instead of string interpolation, for old Python versions.
8e08282c3b Removed unused small.proto.
0f79d47215 Added missing lite binaries to size_data.txt.
555fbbc0bc Size benchmarks are working pretty well.
85cbc41a89 Merge branch 'master' into size-benchmarks
e5bdfba92c Removed accidentally-added .orig file.
07851fac58 Merge pull request #336 from haberman/fuzz
982b634bc5 Fixed a few minor bugs found by fuzzing.
c9d2e58480 Merge pull request #310 from haberman/fast-table
a01f3e23a4 Fixes for google3 build, and exclude even more tests from macOS to avoid timeout.
a83d55ee4b Exclude Clang tests from MacOS to avoid Kokoro timeouts.
73fcfe9ed0 Tried to slim down the tests a bit more.
baab25b7aa Removed excess/redundant tests from Kokoro script.
1eb7bd39e7 Some formatting fixes.
9d87055ce4 Updated Kokoro build script.
4bd34da105 WIP.
a7993615bf Merge branch 'master' into fast-table
3a3efe69a2 Added incompatible_use_toolchain_transition = True per https://github.com/bazelbuild/bazel/issues/11584
7b4e376f79 Switch unordered_set -> absl::flat_hash_set.
fe62fc83e1 Removed obsolete includes in benchmark.
5ed089dc42 Merge pull request #335 from haberman/wyhash-rule
e9b79542ad Added a BUILD file for wyhash.
7b8ae7ec4e Merge branch 'master' into size-benchmarks
a5b5445da6 Merge pull request #334 from haberman/rm-port-c
6c16cba83f Removed obsolete port.c file.
484d8f746a Updated comment in wyhash.h to correct spelling mistake.
6a9d0f45b8 Merge pull request #333 from haberman/32bitfixes
5b1f0d86a1 For Kokoro, only build/test -m32 on Linux.
0497f8deed Fixed a critical bug on 32-bit builds, and added much more Kokoro testing.
7543f851f1 Merge pull request #332 from haberman/php-amalgamation
64abb5eb11 Amalgamation no longer bundles wyhash, but #includes it.
a2a40792b5 Merge pull request #331 from haberman/json-oneof-fix
dd0994d377 Bugfix for JSON decoding: only check real oneofs for duplicates.
496f638025 Merge pull request #330 from haberman/symtab-longjmp
c9f9668234 symtab: use longjmp() for errors and avoid intermediate table.
4d9a8cd67b Merge branch 'master' into symtab-longjmp
6322d1d72d Merge pull request #329 from haberman/benchmark-ads-descriptor
5ec1d39224 Avoid building .pb.cc for ads protos, as C++ takes forever to compile.
43c207ea7e Added CMake dummy rule.
c3b5637646 Added benchmark for loading ads descriptor.
acd72c6d3f WIP.
6ae3b66cd2 Merge pull request #328 from haberman/optdefload
8113ebd6c7 Added explanatory comment about integer constants.
f2d826b9f3 Got rid of floating-point division in table init.
723cd8ffc1 Added wyhash code and LICENSE, and removed temporary benchmark.
15e20636c3 Merge branch 'master' into optdefload
154f2c25f4 Added UTF-8 validation for proto3 string fields.
e8f9eac68c Added #defines UPB_ENABLE_FASTTABLE and UPB_TRY_ENABLE_FASTTABLE.
994cf07cf3 Merge pull request #327 from benjaminp/modern-linking
b5bd5807a7 Migrate to modern Starlark linking api.
dc64613607 Merge branch 'fastest-table' into fast-table
e86541ac1d Fixed the build after the merge.
1cd0cb17d3 Merge branch 'master' into fastest-table
901744a97e Merge pull request #326 from haberman/c99
a0d16e7073 Added a few missing copts, and made some functions proper prototypes.
558315a1c3 Added COPTS to :port.
7e5bd65098 Plumbed copts (including the crucial -std=c99) to upb_proto_library() aspect.
8f3ee80d46 Drop C89/C90 support and MSVC prior to Visual Studio 2015.
a274ad786a Plumbed copts (including the crucial -std=c99) to upb_proto_library() aspect.
2c8bb6dd9d Specify C99 explicitly until/unless we stop using bool.
efd576b698 Added -std=gnu99 for fastdecode and ran Buildifier.
b928696942 A few more fixes, and test fastdecode under Kokoro.
55f3569cd2 A few minor fixes and more assertions.
8b38e8f214 Merge branch 'fastest-table' into fast-table
46eb82467a Added comment to decode_fast.h.
bd9f8f580d Fixed a few bugs with the fast decoder.
3eba47914b Allocate hasbits and table slots in "hotness" order.
021db6fcd5 Allow larger tags into the table if they are unique mod 31.
86d9908c55 Fastdecode support for packed fields.
e3e797b680 Added fasttable support for oneofs.
7ffa9c181a Fixed some small bugs and performance problems in string copying.
e2c709e047 Repeated string and primitive support.
e9103eda9e Merge branch 'master' into fastest-table
0756999ab6 Merge pull request #325 from haberman/inlined-arena
25db40bc30 Fixed upb::InlinedArena, which was compeltely broken.
d81ba58215 Optimized short string copying.
f3a2a79349 More optimization, back up to 2.56GB/s.
199c914295 Simplify push/pop when msg fits in the current buffer.
d5f5db2729 Put string-copying field parser into a separate function.
883f20d4dc Merge branch 'master' into fastest-table
1bd62e8218 Merge pull request #324 from haberman/simplemomi
f4adbe0698 Optimized varint decoding from Gerben.
48689df72e Eliminated bounds checks inside parsing a field.
a345af9883 Added a codegen parameter for whether fasttables are generated or not.
8a3470c543 WIP.
8e8dbb5258 Merge branch 'fastest-table' into fast-table
7d17a0e8c5 Merge branch 'master' into fastest-table
a7e2e8338d Fixed benchmark script.
72de7b7002 Merge branch 'fastest-table' into fast-table
cb234e652c Merge branch 'master' into fastest-table
b86cf2d789 Merge pull request #323 from haberman/build-files
4ea81ab107 Fixed pedantic warning.
6399b31f4b Removed ULL constants in json_decode.c.
c8ae197e64 Removed "U" suffixes, they are not necessary.
bc1e0b314f Fixed some strict C89 errors.
2c1664906a Removed license comments and upb_amalgamation for google3.
b7dc77415a Added licenses() to all BUILD files.
de22764b33 Updated Kokoro to test ... instead of :all.
e3f41de6c7 Split monolithic BUILD file into many build files.
fbe2bcafbc Merge pull request #4 from gerben-s/gerbens-fast-table
9e68ec033f Add repeated varints and fixed parsers
d0e4b688c6 Shorten name of kAliasString, so benchmark results don't wrap.
c0c9b5a168 Regenerated generated code.
eb8e6de8b7 Regenerated source files.
7f0d535826 Merge branch 'fastest-table' into fast-table
bf8e08074c Added a few more comments.
6e3c22e6ee Merge branch 'fastest-table' into fast-table
3238821315 Gave fast table entry a nicer name.
2a574d3d01 Added a bunch of comments for readability.
0deca8b8fb Merge branch 'master' into fast-table
bfadc99709 Merge branch 'master' into fastest-table
84e0f6127d Merge branch 'master' into fastest-table
61c51a607b Merge branch 'master' into fast-table
4f066765a9 Merge pull request #320 from haberman/string-view-benchmark
bf393bf086 Cleaned up benchmark names.
9eb8414b31 Added descriptor_sv.proto.
ee7da95367 Bzl formatting fix per buildifier.
de1b6b0718 Refactored proto2 benchmarks and added StringView benchmark.
c2901eeee1 Added missing #includes (caught by Blaze).
52721eadc7 Order LargeInitialBlock after non-initial-block test.
44a7130845 Used the correct copy of the protos in the benchmark.
3a242e7a48 Merge branch 'master' into fast-table
d01b712dbb Merge branch 'master' into fastest-table
d225dfc2ed Buildifier formatting fixes.
b0994a6501 Added missing dep from benchmark.
de80054018 Make required fields optional for benchmarking.
745661bf1f Merge branch 'master' into fastest-table
11585095b7 Merge pull request #319 from haberman/copy-descriptor
fd5a35d49d Minor comment changes.
bdd1a516e8 Fixed other tests.
27262adf93 Snapshot descriptor.proto into our own copy for benchmarking purposes.
d6b40fd5e2 Added missing dependency on reflection.
b9f1b67d07 Use quoted include.
1c8c16b9b1 Use quoted include.
4f901b6430 Passes all tests.
de84e20788 Merge branch 'master' into optdefload
d5c64476fd Merge pull request #318 from haberman/descriptor-load-benchmark
42d2f6cef9 Add MB/s measures in the benchmarks.
1ce98b86ec Added LoadDescriptor benchmark for proto2.
4890735ce2 Added benchmark for descriptor loading.
6f59f1256e Optimizations to descriptor loading.
6874d61704 Merge pull request #317 from haberman/gencode-compat
c81113e60f Added fallback code for when no enum matches.
c10b24ffb2 Simplified switch().
ded2e657a7 Added compatibility with old generated code.
5b0c5c7d4a Dispatch inline.
75edd3e59c Changed to use table pairs, seems to ever-so-slightly regress.
69d99a247e Merge pull request #3 from haberman/shifted-table
bca7edac8c Cleaned up table compression a bit.
b95f217996 A little speed boost, now hitting 2.51GB/s.
8ed6b2fe85 Stored mask in the table pointer.
a6dc88556d Tables are compressed, but perf goes down to 2.44GB/s.
91eb09b1bc Add a few comments.
7a1835d7c3 Merge branch 'master' into fast-table
8bd5c0088e Merge pull request #316 from haberman/submsg-array
a4966fd230 Added a few extra sanity checks.
99acbe0da8 Fixed bug where submsg array could have excess elements.
2a0425ecf5 Merge pull request #315 from haberman/conformance-fixes
7ccf5650c7 If we encounter "null" for a non-NullValue enum, throw an error.
0a3a94a12f Updated to a new version of protobuf and fixed a few conformance tests.
ddd5f28c4f Merge branch 'is_bazel'
10fa3a0c77 Merge pull request #314 from haberman/addunknown
504e105420 undef UPB_ASAN.
ab96d1ec41 Removed extraneous C++-style comment.
d5096f9ee8 Fixed bug in addunknown and added ASAN poisoning.
6fe84526be Mark _is_bazel to be replace in google3.
f01efe8b64 Removed another C99-ism.
1749082bbb Removed C99-ism.
147e363f56 Merge branch 'master' into fast-table
f2ddc15d76 Bugfix: initialize fastlimit and fastend.
65e49b694b Merge branch 'gerben-fast-table' into fast-table
1abf7d418d Added generated files.
3f719fa6b2 Bugfix: offsetting hasbits with 16 introduced a bug in calculating hasmasks. Removing extra <<16 shift in hasmask calculating and masking out the first 16 bits. This makes messages without hasbits work as well.
aec762e405 Merge branch 'master' into fast-table
4f77aaafd8 Merge pull request #2 from gerben-s/fast-table
4053805759 Bugfixes
d1cd80385b Merge pull request #313 from haberman/inline-arena
ad21083623 Merge pull request #313 from haberman/inline-arena
2339fc779c Updated obsolete comment.
b393849bbd Updated obsolete comment.
ebe53f8590 Fixed compile error.
b37f82b58b Fixed compile error.
71749b7caf Implemented inline array allocation, and moved type->lg2 map to reflection.
9557b97acc Implemented inline array allocation, and moved type->lg2 map to reflection.
b58d2a0ee6 Shrink overhead of message representation.
0bf063a2ca Shrink overhead of message representation.
d87ceeacab Shave off one more store.
ddc52ab9d6 Shave off one more store.
c25d895adf Shrunk the arena state that needs to be synced.
7f67f68c1c Shrunk the arena state that needs to be synced.
ff40dd6ea9 Added new internal header.
85a43e5461 Added new internal header.
36662b3735 Refactor some code. I extracted some common code from all message field parsers, to a tail recursive function. Removed the varint jmp table for a simple varint parse loop, that removes the stack frames. Also careful with not losing information in repeated message tag check. When written mindful the checks and loads that happen can be reused for tag dispatch if not the expected tag.
cbcd635917 Fixed memory leak.
bcbcdadbd2 Fixed memory leak.
e5264bd794 Merge pull request #312 from haberman/defiter
52957fa984 Merge pull request #312 from haberman/defiter
746f64692c Moved arena inline for decoder.
7363b91ac3 Moved arena inline for decoder.
b8ef1dcc57 Removed C++-style comments.
575acd85bd Re-added const for all of the pointer wrapper types.
5aa5b77b41 Added simple offset-based accessors for defs, and deprecated old iterators.
33384301e2 Merge pull request #311 from haberman/proto2-benchmark2
578e7c1f4c Merge pull request #311 from haberman/proto2-benchmark2
bc301e7da4 Use merge/partial variants to give proto2 benchmark the fairest hearing.
30f01afa83 Added LargeInitialBlock test for proto2.
5d23fd99af Used shorter protobuf:: namespace alias.
9938cf8f27 Put submsg_index directly in table data. Drop oneof support for now to focus.
d87179501d Another build fix.
89bd8b87e1 Fixed a few more C89 compat issues.
64d293894a Fixed bug introduced by last optimization.
ff957b996c Fixed C89 compat issues.
537b6f42c2 A few updates to the benchamrk and minor implementation changes.
0dcc5641eb Replicated dispatch and implemeted array resizing logic. Up to 2.67GB/s.
526e430794 I think this may have reached the optimization limit.
4c65b25daf Handle long varints, now 2GB/s!
e39ec95ca2 Hoisted updates to limits and depth out of the loop.
52a0ed3891 Fixed a bug with tag number 15.
388b6f64eb A small optimization: don't increment array length every iteration.
9e5c5ce089 Optimized memset() with cutoff and fixed group & unknown message bugs.
8dd7b5a2ca A bunch more optimization.
e46e94ec7f Added benchmarks for proto2.
405e7934b1 Handle 2-byte submessage lengths.
88b1ec7784 Table-driven supports repeated sub-messages.
f173642db4 Handle non-repeated submessages.
e219a2d91d Merge branch 'decode-arena' into fast-table
7ec2c52346 Donate/steal from arena to accelerate decoding.
d43ccfa079 Revert test changes.
fac992db83 Cleanup for showing.
3937874a85 We have a properly structured algorithm, but perf regresses by 20%.
438ecaeb5a Give all field parsers a generic table entry.
383ae5293e WIP.
26abaa2345 WIP.
34b98bc030 Avoid passing too many params to fallback.
763a3f6293 WIP.
02ff6fb996 Merge pull request #309 from haberman/decoder-forceinline
a202ce9629 Add UPB_FORCEINLINE for varint32 decoding.
d0f2c4c8a2 Merge pull request #308 from haberman/encoder
5741eb9ad7 Expanded benchmarking script and added one size opt to the encoder.
0135399e60 Fixed bug introduced in refactoring.
df3438222b Notated impossible branch as unreachable.
9b31e8fe12 Merged common encode tag paths.
5d7dc718cc Minor formatting fix.
80441e4eb4 Optimized binary encoder.
ada28896b9 Changed encoder to use longjmp() for error recovery.
6e140c267c Added benchmark for encoding.
7338facddb Merge pull request #307 from veblush/port-backport
4d2251c3e4 Add UPB_NORETURN for MSC
git-subtree-dir: third_party/upb
git-subtree-split: 60607da72e89ba0c84c84054d2e562d8b6b61177
4 years ago
|
|
|
return ToCIdent(file->name()) + "_upbdefinit";
|
|
|
|
}
|
|
|
|
|
|
|
|
static std::string DefHeaderFilename(std::string proto_filename) {
|
|
|
|
return StripExtension(proto_filename) + ".upbdefs.h";
|
|
|
|
}
|
|
|
|
|
|
|
|
static std::string DefSourceFilename(std::string proto_filename) {
|
|
|
|
return StripExtension(proto_filename) + ".upbdefs.c";
|
|
|
|
}
|
|
|
|
|
|
|
|
void GenerateMessageDefAccessor(const protobuf::Descriptor* d, Output& output) {
|
|
|
|
output("UPB_INLINE const upb_MessageDef *$0_getmsgdef(upb_DefPool *s) {\n",
|
Squashed 'third_party/upb/' changes from 382d5afc60..60607da72e
60607da72e Merge pull request #356 from haberman/codegen-uniquefiles
7a54a5f3d6 Split the code generators for .upb and .upbdefs.
b10b02f66f Merge pull request #353 from haberman/small-fixes
cd7c2d2701 Merge pull request #352 from haberman/large-field-number
10b355a6e0 A couple minor fixes. These are exercised by Ruby.
6c30b5fe73 Fixed upb encoder for field numbers > 2**28.
31b3528424 Merge pull request #350 from haberman/encode-depthlimit
e9551022c1 Added depth limit checking to upb_encode().
f389384c5a Merge pull request #349 from lidizheng/json-public
f72c26cbc4 Make :json publically visible
5797d95172 Merge pull request #348 from haberman/json-emit-defaults
7a17493269 Removed print debugging.
695b7f4617 Added code to test UPB_JSONENC_EMITDEFAULTS.
6b357607bd Fixed bugs in JSON encoding with UPB_JSONENC_EMITDEFAULTS.
1b08391979 Merge pull request #347 from haberman/filedef-symtab
ee49a8d7df Added an accessor to get the symtab from a filedef.
a81b47025a Merge pull request #345 from haberman/encode-skipunknown
6535cbe380 Merge pull request #346 from timgates42/bugfix_typo_position
7225108720 docs: fix simple typo, posisiton -> position
871ff96252 Test SKIPUNKNOWN on regular fields.
0569c22a1e Removed debug print.
76764643ac Added option to binary encoder to skip unknown fields.
794ce6d061 Merge pull request #344 from haberman/deterministic-serialize
a04627abc8 Added map sorting to binary and text encoders.
3e071ea91a Merge pull request #343 from haberman/msvc
e70e488e09 MSVC apparently doesn't support the standard C/C++ defines.
963e501aa6 Merge pull request #342 from haberman/fuzz
8d670d8aea Renamed decode_varint32() to decode_tag().
9abf8e043f Clamp 32-bit varints to 5 bytes to fix a fuzz failure.
50a543de7f Merge pull request #341 from haberman/code-size
9c87f1168f Added size benchmark for CODE_SIZE.
6f82028236 Merge pull request #340 from haberman/darwin-setjmp
358fa14d0e Fixed headers and updated benchmark script.
bc200451ce Use a macro instead of an inline function for setjmp/longjmp.
ca279f8afa Merge branch 'master' into darwin-setjmp
fbc0639b07 Use _setjmp on mac to avoid saving/restoring the signal mask.
10f0a38450 Merge pull request #337 from haberman/size-benchmarks
4be07a2dce Increase build timeout until we can parallelize the build.
378a27b640 Force "size" to run locally.
da48e01f05 More google3 fixes.
d2446fd2db Moved cc_api_version attribute to proto_library().
4a84390c89 Added cc_proto_library() tweaks for google3.
4dd4212a34 Merge branch 'master' into size-benchmarks
ffecfef161 Merge branch 'master' into size-benchmarks
86f671d5fd Fix for Darwin (output is different, but it won't error out).
165e01ec6f Fix for old Python versions.
40fdff5e43 Merge pull request #339 from haberman/benchmark-alias
5f8bb5de1d Updated generated code.
65d166a6ba Added API for copy vs. alias and added benchmarks to test both.
27b9c999a7 Merge pull request #338 from haberman/arena-initial
9df96874e9 Start arena block doubling at initial block size.
881ddac7fe Also use .format() for gen_synthetic_protos.py.
8b7dabe1a2 Use format() instead of string interpolation, for old Python versions.
8e08282c3b Removed unused small.proto.
0f79d47215 Added missing lite binaries to size_data.txt.
555fbbc0bc Size benchmarks are working pretty well.
85cbc41a89 Merge branch 'master' into size-benchmarks
e5bdfba92c Removed accidentally-added .orig file.
07851fac58 Merge pull request #336 from haberman/fuzz
982b634bc5 Fixed a few minor bugs found by fuzzing.
c9d2e58480 Merge pull request #310 from haberman/fast-table
a01f3e23a4 Fixes for google3 build, and exclude even more tests from macOS to avoid timeout.
a83d55ee4b Exclude Clang tests from MacOS to avoid Kokoro timeouts.
73fcfe9ed0 Tried to slim down the tests a bit more.
baab25b7aa Removed excess/redundant tests from Kokoro script.
1eb7bd39e7 Some formatting fixes.
9d87055ce4 Updated Kokoro build script.
4bd34da105 WIP.
a7993615bf Merge branch 'master' into fast-table
3a3efe69a2 Added incompatible_use_toolchain_transition = True per https://github.com/bazelbuild/bazel/issues/11584
7b4e376f79 Switch unordered_set -> absl::flat_hash_set.
fe62fc83e1 Removed obsolete includes in benchmark.
5ed089dc42 Merge pull request #335 from haberman/wyhash-rule
e9b79542ad Added a BUILD file for wyhash.
7b8ae7ec4e Merge branch 'master' into size-benchmarks
a5b5445da6 Merge pull request #334 from haberman/rm-port-c
6c16cba83f Removed obsolete port.c file.
484d8f746a Updated comment in wyhash.h to correct spelling mistake.
6a9d0f45b8 Merge pull request #333 from haberman/32bitfixes
5b1f0d86a1 For Kokoro, only build/test -m32 on Linux.
0497f8deed Fixed a critical bug on 32-bit builds, and added much more Kokoro testing.
7543f851f1 Merge pull request #332 from haberman/php-amalgamation
64abb5eb11 Amalgamation no longer bundles wyhash, but #includes it.
a2a40792b5 Merge pull request #331 from haberman/json-oneof-fix
dd0994d377 Bugfix for JSON decoding: only check real oneofs for duplicates.
496f638025 Merge pull request #330 from haberman/symtab-longjmp
c9f9668234 symtab: use longjmp() for errors and avoid intermediate table.
4d9a8cd67b Merge branch 'master' into symtab-longjmp
6322d1d72d Merge pull request #329 from haberman/benchmark-ads-descriptor
5ec1d39224 Avoid building .pb.cc for ads protos, as C++ takes forever to compile.
43c207ea7e Added CMake dummy rule.
c3b5637646 Added benchmark for loading ads descriptor.
acd72c6d3f WIP.
6ae3b66cd2 Merge pull request #328 from haberman/optdefload
8113ebd6c7 Added explanatory comment about integer constants.
f2d826b9f3 Got rid of floating-point division in table init.
723cd8ffc1 Added wyhash code and LICENSE, and removed temporary benchmark.
15e20636c3 Merge branch 'master' into optdefload
154f2c25f4 Added UTF-8 validation for proto3 string fields.
e8f9eac68c Added #defines UPB_ENABLE_FASTTABLE and UPB_TRY_ENABLE_FASTTABLE.
994cf07cf3 Merge pull request #327 from benjaminp/modern-linking
b5bd5807a7 Migrate to modern Starlark linking api.
dc64613607 Merge branch 'fastest-table' into fast-table
e86541ac1d Fixed the build after the merge.
1cd0cb17d3 Merge branch 'master' into fastest-table
901744a97e Merge pull request #326 from haberman/c99
a0d16e7073 Added a few missing copts, and made some functions proper prototypes.
558315a1c3 Added COPTS to :port.
7e5bd65098 Plumbed copts (including the crucial -std=c99) to upb_proto_library() aspect.
8f3ee80d46 Drop C89/C90 support and MSVC prior to Visual Studio 2015.
a274ad786a Plumbed copts (including the crucial -std=c99) to upb_proto_library() aspect.
2c8bb6dd9d Specify C99 explicitly until/unless we stop using bool.
efd576b698 Added -std=gnu99 for fastdecode and ran Buildifier.
b928696942 A few more fixes, and test fastdecode under Kokoro.
55f3569cd2 A few minor fixes and more assertions.
8b38e8f214 Merge branch 'fastest-table' into fast-table
46eb82467a Added comment to decode_fast.h.
bd9f8f580d Fixed a few bugs with the fast decoder.
3eba47914b Allocate hasbits and table slots in "hotness" order.
021db6fcd5 Allow larger tags into the table if they are unique mod 31.
86d9908c55 Fastdecode support for packed fields.
e3e797b680 Added fasttable support for oneofs.
7ffa9c181a Fixed some small bugs and performance problems in string copying.
e2c709e047 Repeated string and primitive support.
e9103eda9e Merge branch 'master' into fastest-table
0756999ab6 Merge pull request #325 from haberman/inlined-arena
25db40bc30 Fixed upb::InlinedArena, which was compeltely broken.
d81ba58215 Optimized short string copying.
f3a2a79349 More optimization, back up to 2.56GB/s.
199c914295 Simplify push/pop when msg fits in the current buffer.
d5f5db2729 Put string-copying field parser into a separate function.
883f20d4dc Merge branch 'master' into fastest-table
1bd62e8218 Merge pull request #324 from haberman/simplemomi
f4adbe0698 Optimized varint decoding from Gerben.
48689df72e Eliminated bounds checks inside parsing a field.
a345af9883 Added a codegen parameter for whether fasttables are generated or not.
8a3470c543 WIP.
8e8dbb5258 Merge branch 'fastest-table' into fast-table
7d17a0e8c5 Merge branch 'master' into fastest-table
a7e2e8338d Fixed benchmark script.
72de7b7002 Merge branch 'fastest-table' into fast-table
cb234e652c Merge branch 'master' into fastest-table
b86cf2d789 Merge pull request #323 from haberman/build-files
4ea81ab107 Fixed pedantic warning.
6399b31f4b Removed ULL constants in json_decode.c.
c8ae197e64 Removed "U" suffixes, they are not necessary.
bc1e0b314f Fixed some strict C89 errors.
2c1664906a Removed license comments and upb_amalgamation for google3.
b7dc77415a Added licenses() to all BUILD files.
de22764b33 Updated Kokoro to test ... instead of :all.
e3f41de6c7 Split monolithic BUILD file into many build files.
fbe2bcafbc Merge pull request #4 from gerben-s/gerbens-fast-table
9e68ec033f Add repeated varints and fixed parsers
d0e4b688c6 Shorten name of kAliasString, so benchmark results don't wrap.
c0c9b5a168 Regenerated generated code.
eb8e6de8b7 Regenerated source files.
7f0d535826 Merge branch 'fastest-table' into fast-table
bf8e08074c Added a few more comments.
6e3c22e6ee Merge branch 'fastest-table' into fast-table
3238821315 Gave fast table entry a nicer name.
2a574d3d01 Added a bunch of comments for readability.
0deca8b8fb Merge branch 'master' into fast-table
bfadc99709 Merge branch 'master' into fastest-table
84e0f6127d Merge branch 'master' into fastest-table
61c51a607b Merge branch 'master' into fast-table
4f066765a9 Merge pull request #320 from haberman/string-view-benchmark
bf393bf086 Cleaned up benchmark names.
9eb8414b31 Added descriptor_sv.proto.
ee7da95367 Bzl formatting fix per buildifier.
de1b6b0718 Refactored proto2 benchmarks and added StringView benchmark.
c2901eeee1 Added missing #includes (caught by Blaze).
52721eadc7 Order LargeInitialBlock after non-initial-block test.
44a7130845 Used the correct copy of the protos in the benchmark.
3a242e7a48 Merge branch 'master' into fast-table
d01b712dbb Merge branch 'master' into fastest-table
d225dfc2ed Buildifier formatting fixes.
b0994a6501 Added missing dep from benchmark.
de80054018 Make required fields optional for benchmarking.
745661bf1f Merge branch 'master' into fastest-table
11585095b7 Merge pull request #319 from haberman/copy-descriptor
fd5a35d49d Minor comment changes.
bdd1a516e8 Fixed other tests.
27262adf93 Snapshot descriptor.proto into our own copy for benchmarking purposes.
d6b40fd5e2 Added missing dependency on reflection.
b9f1b67d07 Use quoted include.
1c8c16b9b1 Use quoted include.
4f901b6430 Passes all tests.
de84e20788 Merge branch 'master' into optdefload
d5c64476fd Merge pull request #318 from haberman/descriptor-load-benchmark
42d2f6cef9 Add MB/s measures in the benchmarks.
1ce98b86ec Added LoadDescriptor benchmark for proto2.
4890735ce2 Added benchmark for descriptor loading.
6f59f1256e Optimizations to descriptor loading.
6874d61704 Merge pull request #317 from haberman/gencode-compat
c81113e60f Added fallback code for when no enum matches.
c10b24ffb2 Simplified switch().
ded2e657a7 Added compatibility with old generated code.
5b0c5c7d4a Dispatch inline.
75edd3e59c Changed to use table pairs, seems to ever-so-slightly regress.
69d99a247e Merge pull request #3 from haberman/shifted-table
bca7edac8c Cleaned up table compression a bit.
b95f217996 A little speed boost, now hitting 2.51GB/s.
8ed6b2fe85 Stored mask in the table pointer.
a6dc88556d Tables are compressed, but perf goes down to 2.44GB/s.
91eb09b1bc Add a few comments.
7a1835d7c3 Merge branch 'master' into fast-table
8bd5c0088e Merge pull request #316 from haberman/submsg-array
a4966fd230 Added a few extra sanity checks.
99acbe0da8 Fixed bug where submsg array could have excess elements.
2a0425ecf5 Merge pull request #315 from haberman/conformance-fixes
7ccf5650c7 If we encounter "null" for a non-NullValue enum, throw an error.
0a3a94a12f Updated to a new version of protobuf and fixed a few conformance tests.
ddd5f28c4f Merge branch 'is_bazel'
10fa3a0c77 Merge pull request #314 from haberman/addunknown
504e105420 undef UPB_ASAN.
ab96d1ec41 Removed extraneous C++-style comment.
d5096f9ee8 Fixed bug in addunknown and added ASAN poisoning.
6fe84526be Mark _is_bazel to be replace in google3.
f01efe8b64 Removed another C99-ism.
1749082bbb Removed C99-ism.
147e363f56 Merge branch 'master' into fast-table
f2ddc15d76 Bugfix: initialize fastlimit and fastend.
65e49b694b Merge branch 'gerben-fast-table' into fast-table
1abf7d418d Added generated files.
3f719fa6b2 Bugfix: offsetting hasbits with 16 introduced a bug in calculating hasmasks. Removing extra <<16 shift in hasmask calculating and masking out the first 16 bits. This makes messages without hasbits work as well.
aec762e405 Merge branch 'master' into fast-table
4f77aaafd8 Merge pull request #2 from gerben-s/fast-table
4053805759 Bugfixes
d1cd80385b Merge pull request #313 from haberman/inline-arena
ad21083623 Merge pull request #313 from haberman/inline-arena
2339fc779c Updated obsolete comment.
b393849bbd Updated obsolete comment.
ebe53f8590 Fixed compile error.
b37f82b58b Fixed compile error.
71749b7caf Implemented inline array allocation, and moved type->lg2 map to reflection.
9557b97acc Implemented inline array allocation, and moved type->lg2 map to reflection.
b58d2a0ee6 Shrink overhead of message representation.
0bf063a2ca Shrink overhead of message representation.
d87ceeacab Shave off one more store.
ddc52ab9d6 Shave off one more store.
c25d895adf Shrunk the arena state that needs to be synced.
7f67f68c1c Shrunk the arena state that needs to be synced.
ff40dd6ea9 Added new internal header.
85a43e5461 Added new internal header.
36662b3735 Refactor some code. I extracted some common code from all message field parsers, to a tail recursive function. Removed the varint jmp table for a simple varint parse loop, that removes the stack frames. Also careful with not losing information in repeated message tag check. When written mindful the checks and loads that happen can be reused for tag dispatch if not the expected tag.
cbcd635917 Fixed memory leak.
bcbcdadbd2 Fixed memory leak.
e5264bd794 Merge pull request #312 from haberman/defiter
52957fa984 Merge pull request #312 from haberman/defiter
746f64692c Moved arena inline for decoder.
7363b91ac3 Moved arena inline for decoder.
b8ef1dcc57 Removed C++-style comments.
575acd85bd Re-added const for all of the pointer wrapper types.
5aa5b77b41 Added simple offset-based accessors for defs, and deprecated old iterators.
33384301e2 Merge pull request #311 from haberman/proto2-benchmark2
578e7c1f4c Merge pull request #311 from haberman/proto2-benchmark2
bc301e7da4 Use merge/partial variants to give proto2 benchmark the fairest hearing.
30f01afa83 Added LargeInitialBlock test for proto2.
5d23fd99af Used shorter protobuf:: namespace alias.
9938cf8f27 Put submsg_index directly in table data. Drop oneof support for now to focus.
d87179501d Another build fix.
89bd8b87e1 Fixed a few more C89 compat issues.
64d293894a Fixed bug introduced by last optimization.
ff957b996c Fixed C89 compat issues.
537b6f42c2 A few updates to the benchamrk and minor implementation changes.
0dcc5641eb Replicated dispatch and implemeted array resizing logic. Up to 2.67GB/s.
526e430794 I think this may have reached the optimization limit.
4c65b25daf Handle long varints, now 2GB/s!
e39ec95ca2 Hoisted updates to limits and depth out of the loop.
52a0ed3891 Fixed a bug with tag number 15.
388b6f64eb A small optimization: don't increment array length every iteration.
9e5c5ce089 Optimized memset() with cutoff and fixed group & unknown message bugs.
8dd7b5a2ca A bunch more optimization.
e46e94ec7f Added benchmarks for proto2.
405e7934b1 Handle 2-byte submessage lengths.
88b1ec7784 Table-driven supports repeated sub-messages.
f173642db4 Handle non-repeated submessages.
e219a2d91d Merge branch 'decode-arena' into fast-table
7ec2c52346 Donate/steal from arena to accelerate decoding.
d43ccfa079 Revert test changes.
fac992db83 Cleanup for showing.
3937874a85 We have a properly structured algorithm, but perf regresses by 20%.
438ecaeb5a Give all field parsers a generic table entry.
383ae5293e WIP.
26abaa2345 WIP.
34b98bc030 Avoid passing too many params to fallback.
763a3f6293 WIP.
02ff6fb996 Merge pull request #309 from haberman/decoder-forceinline
a202ce9629 Add UPB_FORCEINLINE for varint32 decoding.
d0f2c4c8a2 Merge pull request #308 from haberman/encoder
5741eb9ad7 Expanded benchmarking script and added one size opt to the encoder.
0135399e60 Fixed bug introduced in refactoring.
df3438222b Notated impossible branch as unreachable.
9b31e8fe12 Merged common encode tag paths.
5d7dc718cc Minor formatting fix.
80441e4eb4 Optimized binary encoder.
ada28896b9 Changed encoder to use longjmp() for error recovery.
6e140c267c Added benchmark for encoding.
7338facddb Merge pull request #307 from veblush/port-backport
4d2251c3e4 Add UPB_NORETURN for MSC
git-subtree-dir: third_party/upb
git-subtree-split: 60607da72e89ba0c84c84054d2e562d8b6b61177
4 years ago
|
|
|
ToCIdent(d->full_name()));
|
|
|
|
output(" _upb_DefPool_LoadDefInit(s, &$0);\n", DefInitSymbol(d->file()));
|
|
|
|
output(" return upb_DefPool_FindMessageByName(s, \"$0\");\n",
|
|
|
|
d->full_name());
|
Squashed 'third_party/upb/' changes from 382d5afc60..60607da72e
60607da72e Merge pull request #356 from haberman/codegen-uniquefiles
7a54a5f3d6 Split the code generators for .upb and .upbdefs.
b10b02f66f Merge pull request #353 from haberman/small-fixes
cd7c2d2701 Merge pull request #352 from haberman/large-field-number
10b355a6e0 A couple minor fixes. These are exercised by Ruby.
6c30b5fe73 Fixed upb encoder for field numbers > 2**28.
31b3528424 Merge pull request #350 from haberman/encode-depthlimit
e9551022c1 Added depth limit checking to upb_encode().
f389384c5a Merge pull request #349 from lidizheng/json-public
f72c26cbc4 Make :json publically visible
5797d95172 Merge pull request #348 from haberman/json-emit-defaults
7a17493269 Removed print debugging.
695b7f4617 Added code to test UPB_JSONENC_EMITDEFAULTS.
6b357607bd Fixed bugs in JSON encoding with UPB_JSONENC_EMITDEFAULTS.
1b08391979 Merge pull request #347 from haberman/filedef-symtab
ee49a8d7df Added an accessor to get the symtab from a filedef.
a81b47025a Merge pull request #345 from haberman/encode-skipunknown
6535cbe380 Merge pull request #346 from timgates42/bugfix_typo_position
7225108720 docs: fix simple typo, posisiton -> position
871ff96252 Test SKIPUNKNOWN on regular fields.
0569c22a1e Removed debug print.
76764643ac Added option to binary encoder to skip unknown fields.
794ce6d061 Merge pull request #344 from haberman/deterministic-serialize
a04627abc8 Added map sorting to binary and text encoders.
3e071ea91a Merge pull request #343 from haberman/msvc
e70e488e09 MSVC apparently doesn't support the standard C/C++ defines.
963e501aa6 Merge pull request #342 from haberman/fuzz
8d670d8aea Renamed decode_varint32() to decode_tag().
9abf8e043f Clamp 32-bit varints to 5 bytes to fix a fuzz failure.
50a543de7f Merge pull request #341 from haberman/code-size
9c87f1168f Added size benchmark for CODE_SIZE.
6f82028236 Merge pull request #340 from haberman/darwin-setjmp
358fa14d0e Fixed headers and updated benchmark script.
bc200451ce Use a macro instead of an inline function for setjmp/longjmp.
ca279f8afa Merge branch 'master' into darwin-setjmp
fbc0639b07 Use _setjmp on mac to avoid saving/restoring the signal mask.
10f0a38450 Merge pull request #337 from haberman/size-benchmarks
4be07a2dce Increase build timeout until we can parallelize the build.
378a27b640 Force "size" to run locally.
da48e01f05 More google3 fixes.
d2446fd2db Moved cc_api_version attribute to proto_library().
4a84390c89 Added cc_proto_library() tweaks for google3.
4dd4212a34 Merge branch 'master' into size-benchmarks
ffecfef161 Merge branch 'master' into size-benchmarks
86f671d5fd Fix for Darwin (output is different, but it won't error out).
165e01ec6f Fix for old Python versions.
40fdff5e43 Merge pull request #339 from haberman/benchmark-alias
5f8bb5de1d Updated generated code.
65d166a6ba Added API for copy vs. alias and added benchmarks to test both.
27b9c999a7 Merge pull request #338 from haberman/arena-initial
9df96874e9 Start arena block doubling at initial block size.
881ddac7fe Also use .format() for gen_synthetic_protos.py.
8b7dabe1a2 Use format() instead of string interpolation, for old Python versions.
8e08282c3b Removed unused small.proto.
0f79d47215 Added missing lite binaries to size_data.txt.
555fbbc0bc Size benchmarks are working pretty well.
85cbc41a89 Merge branch 'master' into size-benchmarks
e5bdfba92c Removed accidentally-added .orig file.
07851fac58 Merge pull request #336 from haberman/fuzz
982b634bc5 Fixed a few minor bugs found by fuzzing.
c9d2e58480 Merge pull request #310 from haberman/fast-table
a01f3e23a4 Fixes for google3 build, and exclude even more tests from macOS to avoid timeout.
a83d55ee4b Exclude Clang tests from MacOS to avoid Kokoro timeouts.
73fcfe9ed0 Tried to slim down the tests a bit more.
baab25b7aa Removed excess/redundant tests from Kokoro script.
1eb7bd39e7 Some formatting fixes.
9d87055ce4 Updated Kokoro build script.
4bd34da105 WIP.
a7993615bf Merge branch 'master' into fast-table
3a3efe69a2 Added incompatible_use_toolchain_transition = True per https://github.com/bazelbuild/bazel/issues/11584
7b4e376f79 Switch unordered_set -> absl::flat_hash_set.
fe62fc83e1 Removed obsolete includes in benchmark.
5ed089dc42 Merge pull request #335 from haberman/wyhash-rule
e9b79542ad Added a BUILD file for wyhash.
7b8ae7ec4e Merge branch 'master' into size-benchmarks
a5b5445da6 Merge pull request #334 from haberman/rm-port-c
6c16cba83f Removed obsolete port.c file.
484d8f746a Updated comment in wyhash.h to correct spelling mistake.
6a9d0f45b8 Merge pull request #333 from haberman/32bitfixes
5b1f0d86a1 For Kokoro, only build/test -m32 on Linux.
0497f8deed Fixed a critical bug on 32-bit builds, and added much more Kokoro testing.
7543f851f1 Merge pull request #332 from haberman/php-amalgamation
64abb5eb11 Amalgamation no longer bundles wyhash, but #includes it.
a2a40792b5 Merge pull request #331 from haberman/json-oneof-fix
dd0994d377 Bugfix for JSON decoding: only check real oneofs for duplicates.
496f638025 Merge pull request #330 from haberman/symtab-longjmp
c9f9668234 symtab: use longjmp() for errors and avoid intermediate table.
4d9a8cd67b Merge branch 'master' into symtab-longjmp
6322d1d72d Merge pull request #329 from haberman/benchmark-ads-descriptor
5ec1d39224 Avoid building .pb.cc for ads protos, as C++ takes forever to compile.
43c207ea7e Added CMake dummy rule.
c3b5637646 Added benchmark for loading ads descriptor.
acd72c6d3f WIP.
6ae3b66cd2 Merge pull request #328 from haberman/optdefload
8113ebd6c7 Added explanatory comment about integer constants.
f2d826b9f3 Got rid of floating-point division in table init.
723cd8ffc1 Added wyhash code and LICENSE, and removed temporary benchmark.
15e20636c3 Merge branch 'master' into optdefload
154f2c25f4 Added UTF-8 validation for proto3 string fields.
e8f9eac68c Added #defines UPB_ENABLE_FASTTABLE and UPB_TRY_ENABLE_FASTTABLE.
994cf07cf3 Merge pull request #327 from benjaminp/modern-linking
b5bd5807a7 Migrate to modern Starlark linking api.
dc64613607 Merge branch 'fastest-table' into fast-table
e86541ac1d Fixed the build after the merge.
1cd0cb17d3 Merge branch 'master' into fastest-table
901744a97e Merge pull request #326 from haberman/c99
a0d16e7073 Added a few missing copts, and made some functions proper prototypes.
558315a1c3 Added COPTS to :port.
7e5bd65098 Plumbed copts (including the crucial -std=c99) to upb_proto_library() aspect.
8f3ee80d46 Drop C89/C90 support and MSVC prior to Visual Studio 2015.
a274ad786a Plumbed copts (including the crucial -std=c99) to upb_proto_library() aspect.
2c8bb6dd9d Specify C99 explicitly until/unless we stop using bool.
efd576b698 Added -std=gnu99 for fastdecode and ran Buildifier.
b928696942 A few more fixes, and test fastdecode under Kokoro.
55f3569cd2 A few minor fixes and more assertions.
8b38e8f214 Merge branch 'fastest-table' into fast-table
46eb82467a Added comment to decode_fast.h.
bd9f8f580d Fixed a few bugs with the fast decoder.
3eba47914b Allocate hasbits and table slots in "hotness" order.
021db6fcd5 Allow larger tags into the table if they are unique mod 31.
86d9908c55 Fastdecode support for packed fields.
e3e797b680 Added fasttable support for oneofs.
7ffa9c181a Fixed some small bugs and performance problems in string copying.
e2c709e047 Repeated string and primitive support.
e9103eda9e Merge branch 'master' into fastest-table
0756999ab6 Merge pull request #325 from haberman/inlined-arena
25db40bc30 Fixed upb::InlinedArena, which was compeltely broken.
d81ba58215 Optimized short string copying.
f3a2a79349 More optimization, back up to 2.56GB/s.
199c914295 Simplify push/pop when msg fits in the current buffer.
d5f5db2729 Put string-copying field parser into a separate function.
883f20d4dc Merge branch 'master' into fastest-table
1bd62e8218 Merge pull request #324 from haberman/simplemomi
f4adbe0698 Optimized varint decoding from Gerben.
48689df72e Eliminated bounds checks inside parsing a field.
a345af9883 Added a codegen parameter for whether fasttables are generated or not.
8a3470c543 WIP.
8e8dbb5258 Merge branch 'fastest-table' into fast-table
7d17a0e8c5 Merge branch 'master' into fastest-table
a7e2e8338d Fixed benchmark script.
72de7b7002 Merge branch 'fastest-table' into fast-table
cb234e652c Merge branch 'master' into fastest-table
b86cf2d789 Merge pull request #323 from haberman/build-files
4ea81ab107 Fixed pedantic warning.
6399b31f4b Removed ULL constants in json_decode.c.
c8ae197e64 Removed "U" suffixes, they are not necessary.
bc1e0b314f Fixed some strict C89 errors.
2c1664906a Removed license comments and upb_amalgamation for google3.
b7dc77415a Added licenses() to all BUILD files.
de22764b33 Updated Kokoro to test ... instead of :all.
e3f41de6c7 Split monolithic BUILD file into many build files.
fbe2bcafbc Merge pull request #4 from gerben-s/gerbens-fast-table
9e68ec033f Add repeated varints and fixed parsers
d0e4b688c6 Shorten name of kAliasString, so benchmark results don't wrap.
c0c9b5a168 Regenerated generated code.
eb8e6de8b7 Regenerated source files.
7f0d535826 Merge branch 'fastest-table' into fast-table
bf8e08074c Added a few more comments.
6e3c22e6ee Merge branch 'fastest-table' into fast-table
3238821315 Gave fast table entry a nicer name.
2a574d3d01 Added a bunch of comments for readability.
0deca8b8fb Merge branch 'master' into fast-table
bfadc99709 Merge branch 'master' into fastest-table
84e0f6127d Merge branch 'master' into fastest-table
61c51a607b Merge branch 'master' into fast-table
4f066765a9 Merge pull request #320 from haberman/string-view-benchmark
bf393bf086 Cleaned up benchmark names.
9eb8414b31 Added descriptor_sv.proto.
ee7da95367 Bzl formatting fix per buildifier.
de1b6b0718 Refactored proto2 benchmarks and added StringView benchmark.
c2901eeee1 Added missing #includes (caught by Blaze).
52721eadc7 Order LargeInitialBlock after non-initial-block test.
44a7130845 Used the correct copy of the protos in the benchmark.
3a242e7a48 Merge branch 'master' into fast-table
d01b712dbb Merge branch 'master' into fastest-table
d225dfc2ed Buildifier formatting fixes.
b0994a6501 Added missing dep from benchmark.
de80054018 Make required fields optional for benchmarking.
745661bf1f Merge branch 'master' into fastest-table
11585095b7 Merge pull request #319 from haberman/copy-descriptor
fd5a35d49d Minor comment changes.
bdd1a516e8 Fixed other tests.
27262adf93 Snapshot descriptor.proto into our own copy for benchmarking purposes.
d6b40fd5e2 Added missing dependency on reflection.
b9f1b67d07 Use quoted include.
1c8c16b9b1 Use quoted include.
4f901b6430 Passes all tests.
de84e20788 Merge branch 'master' into optdefload
d5c64476fd Merge pull request #318 from haberman/descriptor-load-benchmark
42d2f6cef9 Add MB/s measures in the benchmarks.
1ce98b86ec Added LoadDescriptor benchmark for proto2.
4890735ce2 Added benchmark for descriptor loading.
6f59f1256e Optimizations to descriptor loading.
6874d61704 Merge pull request #317 from haberman/gencode-compat
c81113e60f Added fallback code for when no enum matches.
c10b24ffb2 Simplified switch().
ded2e657a7 Added compatibility with old generated code.
5b0c5c7d4a Dispatch inline.
75edd3e59c Changed to use table pairs, seems to ever-so-slightly regress.
69d99a247e Merge pull request #3 from haberman/shifted-table
bca7edac8c Cleaned up table compression a bit.
b95f217996 A little speed boost, now hitting 2.51GB/s.
8ed6b2fe85 Stored mask in the table pointer.
a6dc88556d Tables are compressed, but perf goes down to 2.44GB/s.
91eb09b1bc Add a few comments.
7a1835d7c3 Merge branch 'master' into fast-table
8bd5c0088e Merge pull request #316 from haberman/submsg-array
a4966fd230 Added a few extra sanity checks.
99acbe0da8 Fixed bug where submsg array could have excess elements.
2a0425ecf5 Merge pull request #315 from haberman/conformance-fixes
7ccf5650c7 If we encounter "null" for a non-NullValue enum, throw an error.
0a3a94a12f Updated to a new version of protobuf and fixed a few conformance tests.
ddd5f28c4f Merge branch 'is_bazel'
10fa3a0c77 Merge pull request #314 from haberman/addunknown
504e105420 undef UPB_ASAN.
ab96d1ec41 Removed extraneous C++-style comment.
d5096f9ee8 Fixed bug in addunknown and added ASAN poisoning.
6fe84526be Mark _is_bazel to be replace in google3.
f01efe8b64 Removed another C99-ism.
1749082bbb Removed C99-ism.
147e363f56 Merge branch 'master' into fast-table
f2ddc15d76 Bugfix: initialize fastlimit and fastend.
65e49b694b Merge branch 'gerben-fast-table' into fast-table
1abf7d418d Added generated files.
3f719fa6b2 Bugfix: offsetting hasbits with 16 introduced a bug in calculating hasmasks. Removing extra <<16 shift in hasmask calculating and masking out the first 16 bits. This makes messages without hasbits work as well.
aec762e405 Merge branch 'master' into fast-table
4f77aaafd8 Merge pull request #2 from gerben-s/fast-table
4053805759 Bugfixes
d1cd80385b Merge pull request #313 from haberman/inline-arena
ad21083623 Merge pull request #313 from haberman/inline-arena
2339fc779c Updated obsolete comment.
b393849bbd Updated obsolete comment.
ebe53f8590 Fixed compile error.
b37f82b58b Fixed compile error.
71749b7caf Implemented inline array allocation, and moved type->lg2 map to reflection.
9557b97acc Implemented inline array allocation, and moved type->lg2 map to reflection.
b58d2a0ee6 Shrink overhead of message representation.
0bf063a2ca Shrink overhead of message representation.
d87ceeacab Shave off one more store.
ddc52ab9d6 Shave off one more store.
c25d895adf Shrunk the arena state that needs to be synced.
7f67f68c1c Shrunk the arena state that needs to be synced.
ff40dd6ea9 Added new internal header.
85a43e5461 Added new internal header.
36662b3735 Refactor some code. I extracted some common code from all message field parsers, to a tail recursive function. Removed the varint jmp table for a simple varint parse loop, that removes the stack frames. Also careful with not losing information in repeated message tag check. When written mindful the checks and loads that happen can be reused for tag dispatch if not the expected tag.
cbcd635917 Fixed memory leak.
bcbcdadbd2 Fixed memory leak.
e5264bd794 Merge pull request #312 from haberman/defiter
52957fa984 Merge pull request #312 from haberman/defiter
746f64692c Moved arena inline for decoder.
7363b91ac3 Moved arena inline for decoder.
b8ef1dcc57 Removed C++-style comments.
575acd85bd Re-added const for all of the pointer wrapper types.
5aa5b77b41 Added simple offset-based accessors for defs, and deprecated old iterators.
33384301e2 Merge pull request #311 from haberman/proto2-benchmark2
578e7c1f4c Merge pull request #311 from haberman/proto2-benchmark2
bc301e7da4 Use merge/partial variants to give proto2 benchmark the fairest hearing.
30f01afa83 Added LargeInitialBlock test for proto2.
5d23fd99af Used shorter protobuf:: namespace alias.
9938cf8f27 Put submsg_index directly in table data. Drop oneof support for now to focus.
d87179501d Another build fix.
89bd8b87e1 Fixed a few more C89 compat issues.
64d293894a Fixed bug introduced by last optimization.
ff957b996c Fixed C89 compat issues.
537b6f42c2 A few updates to the benchamrk and minor implementation changes.
0dcc5641eb Replicated dispatch and implemeted array resizing logic. Up to 2.67GB/s.
526e430794 I think this may have reached the optimization limit.
4c65b25daf Handle long varints, now 2GB/s!
e39ec95ca2 Hoisted updates to limits and depth out of the loop.
52a0ed3891 Fixed a bug with tag number 15.
388b6f64eb A small optimization: don't increment array length every iteration.
9e5c5ce089 Optimized memset() with cutoff and fixed group & unknown message bugs.
8dd7b5a2ca A bunch more optimization.
e46e94ec7f Added benchmarks for proto2.
405e7934b1 Handle 2-byte submessage lengths.
88b1ec7784 Table-driven supports repeated sub-messages.
f173642db4 Handle non-repeated submessages.
e219a2d91d Merge branch 'decode-arena' into fast-table
7ec2c52346 Donate/steal from arena to accelerate decoding.
d43ccfa079 Revert test changes.
fac992db83 Cleanup for showing.
3937874a85 We have a properly structured algorithm, but perf regresses by 20%.
438ecaeb5a Give all field parsers a generic table entry.
383ae5293e WIP.
26abaa2345 WIP.
34b98bc030 Avoid passing too many params to fallback.
763a3f6293 WIP.
02ff6fb996 Merge pull request #309 from haberman/decoder-forceinline
a202ce9629 Add UPB_FORCEINLINE for varint32 decoding.
d0f2c4c8a2 Merge pull request #308 from haberman/encoder
5741eb9ad7 Expanded benchmarking script and added one size opt to the encoder.
0135399e60 Fixed bug introduced in refactoring.
df3438222b Notated impossible branch as unreachable.
9b31e8fe12 Merged common encode tag paths.
5d7dc718cc Minor formatting fix.
80441e4eb4 Optimized binary encoder.
ada28896b9 Changed encoder to use longjmp() for error recovery.
6e140c267c Added benchmark for encoding.
7338facddb Merge pull request #307 from veblush/port-backport
4d2251c3e4 Add UPB_NORETURN for MSC
git-subtree-dir: third_party/upb
git-subtree-split: 60607da72e89ba0c84c84054d2e562d8b6b61177
4 years ago
|
|
|
output("}\n");
|
|
|
|
output("\n");
|
|
|
|
|
|
|
|
for (int i = 0; i < d->nested_type_count(); i++) {
|
|
|
|
GenerateMessageDefAccessor(d->nested_type(i), output);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void WriteDefHeader(const protobuf::FileDescriptor* file, Output& output) {
|
|
|
|
EmitFileWarning(file, output);
|
|
|
|
|
|
|
|
output(
|
|
|
|
"#ifndef $0_UPBDEFS_H_\n"
|
|
|
|
"#define $0_UPBDEFS_H_\n\n"
|
|
|
|
"#include \"upb/def.h\"\n"
|
|
|
|
"#include \"upb/port_def.inc\"\n"
|
|
|
|
"#ifdef __cplusplus\n"
|
|
|
|
"extern \"C\" {\n"
|
|
|
|
"#endif\n\n",
|
|
|
|
ToPreproc(file->name()));
|
|
|
|
|
|
|
|
output("#include \"upb/def.h\"\n");
|
|
|
|
output("\n");
|
|
|
|
output("#include \"upb/port_def.inc\"\n");
|
|
|
|
output("\n");
|
|
|
|
|
|
|
|
output("extern _upb_DefPool_Init $0;\n", DefInitSymbol(file));
|
Squashed 'third_party/upb/' changes from 382d5afc60..60607da72e
60607da72e Merge pull request #356 from haberman/codegen-uniquefiles
7a54a5f3d6 Split the code generators for .upb and .upbdefs.
b10b02f66f Merge pull request #353 from haberman/small-fixes
cd7c2d2701 Merge pull request #352 from haberman/large-field-number
10b355a6e0 A couple minor fixes. These are exercised by Ruby.
6c30b5fe73 Fixed upb encoder for field numbers > 2**28.
31b3528424 Merge pull request #350 from haberman/encode-depthlimit
e9551022c1 Added depth limit checking to upb_encode().
f389384c5a Merge pull request #349 from lidizheng/json-public
f72c26cbc4 Make :json publically visible
5797d95172 Merge pull request #348 from haberman/json-emit-defaults
7a17493269 Removed print debugging.
695b7f4617 Added code to test UPB_JSONENC_EMITDEFAULTS.
6b357607bd Fixed bugs in JSON encoding with UPB_JSONENC_EMITDEFAULTS.
1b08391979 Merge pull request #347 from haberman/filedef-symtab
ee49a8d7df Added an accessor to get the symtab from a filedef.
a81b47025a Merge pull request #345 from haberman/encode-skipunknown
6535cbe380 Merge pull request #346 from timgates42/bugfix_typo_position
7225108720 docs: fix simple typo, posisiton -> position
871ff96252 Test SKIPUNKNOWN on regular fields.
0569c22a1e Removed debug print.
76764643ac Added option to binary encoder to skip unknown fields.
794ce6d061 Merge pull request #344 from haberman/deterministic-serialize
a04627abc8 Added map sorting to binary and text encoders.
3e071ea91a Merge pull request #343 from haberman/msvc
e70e488e09 MSVC apparently doesn't support the standard C/C++ defines.
963e501aa6 Merge pull request #342 from haberman/fuzz
8d670d8aea Renamed decode_varint32() to decode_tag().
9abf8e043f Clamp 32-bit varints to 5 bytes to fix a fuzz failure.
50a543de7f Merge pull request #341 from haberman/code-size
9c87f1168f Added size benchmark for CODE_SIZE.
6f82028236 Merge pull request #340 from haberman/darwin-setjmp
358fa14d0e Fixed headers and updated benchmark script.
bc200451ce Use a macro instead of an inline function for setjmp/longjmp.
ca279f8afa Merge branch 'master' into darwin-setjmp
fbc0639b07 Use _setjmp on mac to avoid saving/restoring the signal mask.
10f0a38450 Merge pull request #337 from haberman/size-benchmarks
4be07a2dce Increase build timeout until we can parallelize the build.
378a27b640 Force "size" to run locally.
da48e01f05 More google3 fixes.
d2446fd2db Moved cc_api_version attribute to proto_library().
4a84390c89 Added cc_proto_library() tweaks for google3.
4dd4212a34 Merge branch 'master' into size-benchmarks
ffecfef161 Merge branch 'master' into size-benchmarks
86f671d5fd Fix for Darwin (output is different, but it won't error out).
165e01ec6f Fix for old Python versions.
40fdff5e43 Merge pull request #339 from haberman/benchmark-alias
5f8bb5de1d Updated generated code.
65d166a6ba Added API for copy vs. alias and added benchmarks to test both.
27b9c999a7 Merge pull request #338 from haberman/arena-initial
9df96874e9 Start arena block doubling at initial block size.
881ddac7fe Also use .format() for gen_synthetic_protos.py.
8b7dabe1a2 Use format() instead of string interpolation, for old Python versions.
8e08282c3b Removed unused small.proto.
0f79d47215 Added missing lite binaries to size_data.txt.
555fbbc0bc Size benchmarks are working pretty well.
85cbc41a89 Merge branch 'master' into size-benchmarks
e5bdfba92c Removed accidentally-added .orig file.
07851fac58 Merge pull request #336 from haberman/fuzz
982b634bc5 Fixed a few minor bugs found by fuzzing.
c9d2e58480 Merge pull request #310 from haberman/fast-table
a01f3e23a4 Fixes for google3 build, and exclude even more tests from macOS to avoid timeout.
a83d55ee4b Exclude Clang tests from MacOS to avoid Kokoro timeouts.
73fcfe9ed0 Tried to slim down the tests a bit more.
baab25b7aa Removed excess/redundant tests from Kokoro script.
1eb7bd39e7 Some formatting fixes.
9d87055ce4 Updated Kokoro build script.
4bd34da105 WIP.
a7993615bf Merge branch 'master' into fast-table
3a3efe69a2 Added incompatible_use_toolchain_transition = True per https://github.com/bazelbuild/bazel/issues/11584
7b4e376f79 Switch unordered_set -> absl::flat_hash_set.
fe62fc83e1 Removed obsolete includes in benchmark.
5ed089dc42 Merge pull request #335 from haberman/wyhash-rule
e9b79542ad Added a BUILD file for wyhash.
7b8ae7ec4e Merge branch 'master' into size-benchmarks
a5b5445da6 Merge pull request #334 from haberman/rm-port-c
6c16cba83f Removed obsolete port.c file.
484d8f746a Updated comment in wyhash.h to correct spelling mistake.
6a9d0f45b8 Merge pull request #333 from haberman/32bitfixes
5b1f0d86a1 For Kokoro, only build/test -m32 on Linux.
0497f8deed Fixed a critical bug on 32-bit builds, and added much more Kokoro testing.
7543f851f1 Merge pull request #332 from haberman/php-amalgamation
64abb5eb11 Amalgamation no longer bundles wyhash, but #includes it.
a2a40792b5 Merge pull request #331 from haberman/json-oneof-fix
dd0994d377 Bugfix for JSON decoding: only check real oneofs for duplicates.
496f638025 Merge pull request #330 from haberman/symtab-longjmp
c9f9668234 symtab: use longjmp() for errors and avoid intermediate table.
4d9a8cd67b Merge branch 'master' into symtab-longjmp
6322d1d72d Merge pull request #329 from haberman/benchmark-ads-descriptor
5ec1d39224 Avoid building .pb.cc for ads protos, as C++ takes forever to compile.
43c207ea7e Added CMake dummy rule.
c3b5637646 Added benchmark for loading ads descriptor.
acd72c6d3f WIP.
6ae3b66cd2 Merge pull request #328 from haberman/optdefload
8113ebd6c7 Added explanatory comment about integer constants.
f2d826b9f3 Got rid of floating-point division in table init.
723cd8ffc1 Added wyhash code and LICENSE, and removed temporary benchmark.
15e20636c3 Merge branch 'master' into optdefload
154f2c25f4 Added UTF-8 validation for proto3 string fields.
e8f9eac68c Added #defines UPB_ENABLE_FASTTABLE and UPB_TRY_ENABLE_FASTTABLE.
994cf07cf3 Merge pull request #327 from benjaminp/modern-linking
b5bd5807a7 Migrate to modern Starlark linking api.
dc64613607 Merge branch 'fastest-table' into fast-table
e86541ac1d Fixed the build after the merge.
1cd0cb17d3 Merge branch 'master' into fastest-table
901744a97e Merge pull request #326 from haberman/c99
a0d16e7073 Added a few missing copts, and made some functions proper prototypes.
558315a1c3 Added COPTS to :port.
7e5bd65098 Plumbed copts (including the crucial -std=c99) to upb_proto_library() aspect.
8f3ee80d46 Drop C89/C90 support and MSVC prior to Visual Studio 2015.
a274ad786a Plumbed copts (including the crucial -std=c99) to upb_proto_library() aspect.
2c8bb6dd9d Specify C99 explicitly until/unless we stop using bool.
efd576b698 Added -std=gnu99 for fastdecode and ran Buildifier.
b928696942 A few more fixes, and test fastdecode under Kokoro.
55f3569cd2 A few minor fixes and more assertions.
8b38e8f214 Merge branch 'fastest-table' into fast-table
46eb82467a Added comment to decode_fast.h.
bd9f8f580d Fixed a few bugs with the fast decoder.
3eba47914b Allocate hasbits and table slots in "hotness" order.
021db6fcd5 Allow larger tags into the table if they are unique mod 31.
86d9908c55 Fastdecode support for packed fields.
e3e797b680 Added fasttable support for oneofs.
7ffa9c181a Fixed some small bugs and performance problems in string copying.
e2c709e047 Repeated string and primitive support.
e9103eda9e Merge branch 'master' into fastest-table
0756999ab6 Merge pull request #325 from haberman/inlined-arena
25db40bc30 Fixed upb::InlinedArena, which was compeltely broken.
d81ba58215 Optimized short string copying.
f3a2a79349 More optimization, back up to 2.56GB/s.
199c914295 Simplify push/pop when msg fits in the current buffer.
d5f5db2729 Put string-copying field parser into a separate function.
883f20d4dc Merge branch 'master' into fastest-table
1bd62e8218 Merge pull request #324 from haberman/simplemomi
f4adbe0698 Optimized varint decoding from Gerben.
48689df72e Eliminated bounds checks inside parsing a field.
a345af9883 Added a codegen parameter for whether fasttables are generated or not.
8a3470c543 WIP.
8e8dbb5258 Merge branch 'fastest-table' into fast-table
7d17a0e8c5 Merge branch 'master' into fastest-table
a7e2e8338d Fixed benchmark script.
72de7b7002 Merge branch 'fastest-table' into fast-table
cb234e652c Merge branch 'master' into fastest-table
b86cf2d789 Merge pull request #323 from haberman/build-files
4ea81ab107 Fixed pedantic warning.
6399b31f4b Removed ULL constants in json_decode.c.
c8ae197e64 Removed "U" suffixes, they are not necessary.
bc1e0b314f Fixed some strict C89 errors.
2c1664906a Removed license comments and upb_amalgamation for google3.
b7dc77415a Added licenses() to all BUILD files.
de22764b33 Updated Kokoro to test ... instead of :all.
e3f41de6c7 Split monolithic BUILD file into many build files.
fbe2bcafbc Merge pull request #4 from gerben-s/gerbens-fast-table
9e68ec033f Add repeated varints and fixed parsers
d0e4b688c6 Shorten name of kAliasString, so benchmark results don't wrap.
c0c9b5a168 Regenerated generated code.
eb8e6de8b7 Regenerated source files.
7f0d535826 Merge branch 'fastest-table' into fast-table
bf8e08074c Added a few more comments.
6e3c22e6ee Merge branch 'fastest-table' into fast-table
3238821315 Gave fast table entry a nicer name.
2a574d3d01 Added a bunch of comments for readability.
0deca8b8fb Merge branch 'master' into fast-table
bfadc99709 Merge branch 'master' into fastest-table
84e0f6127d Merge branch 'master' into fastest-table
61c51a607b Merge branch 'master' into fast-table
4f066765a9 Merge pull request #320 from haberman/string-view-benchmark
bf393bf086 Cleaned up benchmark names.
9eb8414b31 Added descriptor_sv.proto.
ee7da95367 Bzl formatting fix per buildifier.
de1b6b0718 Refactored proto2 benchmarks and added StringView benchmark.
c2901eeee1 Added missing #includes (caught by Blaze).
52721eadc7 Order LargeInitialBlock after non-initial-block test.
44a7130845 Used the correct copy of the protos in the benchmark.
3a242e7a48 Merge branch 'master' into fast-table
d01b712dbb Merge branch 'master' into fastest-table
d225dfc2ed Buildifier formatting fixes.
b0994a6501 Added missing dep from benchmark.
de80054018 Make required fields optional for benchmarking.
745661bf1f Merge branch 'master' into fastest-table
11585095b7 Merge pull request #319 from haberman/copy-descriptor
fd5a35d49d Minor comment changes.
bdd1a516e8 Fixed other tests.
27262adf93 Snapshot descriptor.proto into our own copy for benchmarking purposes.
d6b40fd5e2 Added missing dependency on reflection.
b9f1b67d07 Use quoted include.
1c8c16b9b1 Use quoted include.
4f901b6430 Passes all tests.
de84e20788 Merge branch 'master' into optdefload
d5c64476fd Merge pull request #318 from haberman/descriptor-load-benchmark
42d2f6cef9 Add MB/s measures in the benchmarks.
1ce98b86ec Added LoadDescriptor benchmark for proto2.
4890735ce2 Added benchmark for descriptor loading.
6f59f1256e Optimizations to descriptor loading.
6874d61704 Merge pull request #317 from haberman/gencode-compat
c81113e60f Added fallback code for when no enum matches.
c10b24ffb2 Simplified switch().
ded2e657a7 Added compatibility with old generated code.
5b0c5c7d4a Dispatch inline.
75edd3e59c Changed to use table pairs, seems to ever-so-slightly regress.
69d99a247e Merge pull request #3 from haberman/shifted-table
bca7edac8c Cleaned up table compression a bit.
b95f217996 A little speed boost, now hitting 2.51GB/s.
8ed6b2fe85 Stored mask in the table pointer.
a6dc88556d Tables are compressed, but perf goes down to 2.44GB/s.
91eb09b1bc Add a few comments.
7a1835d7c3 Merge branch 'master' into fast-table
8bd5c0088e Merge pull request #316 from haberman/submsg-array
a4966fd230 Added a few extra sanity checks.
99acbe0da8 Fixed bug where submsg array could have excess elements.
2a0425ecf5 Merge pull request #315 from haberman/conformance-fixes
7ccf5650c7 If we encounter "null" for a non-NullValue enum, throw an error.
0a3a94a12f Updated to a new version of protobuf and fixed a few conformance tests.
ddd5f28c4f Merge branch 'is_bazel'
10fa3a0c77 Merge pull request #314 from haberman/addunknown
504e105420 undef UPB_ASAN.
ab96d1ec41 Removed extraneous C++-style comment.
d5096f9ee8 Fixed bug in addunknown and added ASAN poisoning.
6fe84526be Mark _is_bazel to be replace in google3.
f01efe8b64 Removed another C99-ism.
1749082bbb Removed C99-ism.
147e363f56 Merge branch 'master' into fast-table
f2ddc15d76 Bugfix: initialize fastlimit and fastend.
65e49b694b Merge branch 'gerben-fast-table' into fast-table
1abf7d418d Added generated files.
3f719fa6b2 Bugfix: offsetting hasbits with 16 introduced a bug in calculating hasmasks. Removing extra <<16 shift in hasmask calculating and masking out the first 16 bits. This makes messages without hasbits work as well.
aec762e405 Merge branch 'master' into fast-table
4f77aaafd8 Merge pull request #2 from gerben-s/fast-table
4053805759 Bugfixes
d1cd80385b Merge pull request #313 from haberman/inline-arena
ad21083623 Merge pull request #313 from haberman/inline-arena
2339fc779c Updated obsolete comment.
b393849bbd Updated obsolete comment.
ebe53f8590 Fixed compile error.
b37f82b58b Fixed compile error.
71749b7caf Implemented inline array allocation, and moved type->lg2 map to reflection.
9557b97acc Implemented inline array allocation, and moved type->lg2 map to reflection.
b58d2a0ee6 Shrink overhead of message representation.
0bf063a2ca Shrink overhead of message representation.
d87ceeacab Shave off one more store.
ddc52ab9d6 Shave off one more store.
c25d895adf Shrunk the arena state that needs to be synced.
7f67f68c1c Shrunk the arena state that needs to be synced.
ff40dd6ea9 Added new internal header.
85a43e5461 Added new internal header.
36662b3735 Refactor some code. I extracted some common code from all message field parsers, to a tail recursive function. Removed the varint jmp table for a simple varint parse loop, that removes the stack frames. Also careful with not losing information in repeated message tag check. When written mindful the checks and loads that happen can be reused for tag dispatch if not the expected tag.
cbcd635917 Fixed memory leak.
bcbcdadbd2 Fixed memory leak.
e5264bd794 Merge pull request #312 from haberman/defiter
52957fa984 Merge pull request #312 from haberman/defiter
746f64692c Moved arena inline for decoder.
7363b91ac3 Moved arena inline for decoder.
b8ef1dcc57 Removed C++-style comments.
575acd85bd Re-added const for all of the pointer wrapper types.
5aa5b77b41 Added simple offset-based accessors for defs, and deprecated old iterators.
33384301e2 Merge pull request #311 from haberman/proto2-benchmark2
578e7c1f4c Merge pull request #311 from haberman/proto2-benchmark2
bc301e7da4 Use merge/partial variants to give proto2 benchmark the fairest hearing.
30f01afa83 Added LargeInitialBlock test for proto2.
5d23fd99af Used shorter protobuf:: namespace alias.
9938cf8f27 Put submsg_index directly in table data. Drop oneof support for now to focus.
d87179501d Another build fix.
89bd8b87e1 Fixed a few more C89 compat issues.
64d293894a Fixed bug introduced by last optimization.
ff957b996c Fixed C89 compat issues.
537b6f42c2 A few updates to the benchamrk and minor implementation changes.
0dcc5641eb Replicated dispatch and implemeted array resizing logic. Up to 2.67GB/s.
526e430794 I think this may have reached the optimization limit.
4c65b25daf Handle long varints, now 2GB/s!
e39ec95ca2 Hoisted updates to limits and depth out of the loop.
52a0ed3891 Fixed a bug with tag number 15.
388b6f64eb A small optimization: don't increment array length every iteration.
9e5c5ce089 Optimized memset() with cutoff and fixed group & unknown message bugs.
8dd7b5a2ca A bunch more optimization.
e46e94ec7f Added benchmarks for proto2.
405e7934b1 Handle 2-byte submessage lengths.
88b1ec7784 Table-driven supports repeated sub-messages.
f173642db4 Handle non-repeated submessages.
e219a2d91d Merge branch 'decode-arena' into fast-table
7ec2c52346 Donate/steal from arena to accelerate decoding.
d43ccfa079 Revert test changes.
fac992db83 Cleanup for showing.
3937874a85 We have a properly structured algorithm, but perf regresses by 20%.
438ecaeb5a Give all field parsers a generic table entry.
383ae5293e WIP.
26abaa2345 WIP.
34b98bc030 Avoid passing too many params to fallback.
763a3f6293 WIP.
02ff6fb996 Merge pull request #309 from haberman/decoder-forceinline
a202ce9629 Add UPB_FORCEINLINE for varint32 decoding.
d0f2c4c8a2 Merge pull request #308 from haberman/encoder
5741eb9ad7 Expanded benchmarking script and added one size opt to the encoder.
0135399e60 Fixed bug introduced in refactoring.
df3438222b Notated impossible branch as unreachable.
9b31e8fe12 Merged common encode tag paths.
5d7dc718cc Minor formatting fix.
80441e4eb4 Optimized binary encoder.
ada28896b9 Changed encoder to use longjmp() for error recovery.
6e140c267c Added benchmark for encoding.
7338facddb Merge pull request #307 from veblush/port-backport
4d2251c3e4 Add UPB_NORETURN for MSC
git-subtree-dir: third_party/upb
git-subtree-split: 60607da72e89ba0c84c84054d2e562d8b6b61177
4 years ago
|
|
|
output("\n");
|
|
|
|
|
|
|
|
for (int i = 0; i < file->message_type_count(); i++) {
|
|
|
|
GenerateMessageDefAccessor(file->message_type(i), output);
|
|
|
|
}
|
|
|
|
|
|
|
|
output(
|
|
|
|
"#ifdef __cplusplus\n"
|
|
|
|
"} /* extern \"C\" */\n"
|
|
|
|
"#endif\n"
|
|
|
|
"\n"
|
|
|
|
"#include \"upb/port_undef.inc\"\n"
|
|
|
|
"\n"
|
|
|
|
"#endif /* $0_UPBDEFS_H_ */\n",
|
|
|
|
ToPreproc(file->name()));
|
|
|
|
}
|
|
|
|
|
|
|
|
void WriteDefSource(const protobuf::FileDescriptor* file, Output& output) {
|
|
|
|
EmitFileWarning(file, output);
|
|
|
|
|
|
|
|
output("#include \"upb/def.h\"\n");
|
|
|
|
output("#include \"$0\"\n", DefHeaderFilename(file->name()));
|
|
|
|
output("#include \"$0\"\n", HeaderFilename(file));
|
Squashed 'third_party/upb/' changes from 382d5afc60..60607da72e
60607da72e Merge pull request #356 from haberman/codegen-uniquefiles
7a54a5f3d6 Split the code generators for .upb and .upbdefs.
b10b02f66f Merge pull request #353 from haberman/small-fixes
cd7c2d2701 Merge pull request #352 from haberman/large-field-number
10b355a6e0 A couple minor fixes. These are exercised by Ruby.
6c30b5fe73 Fixed upb encoder for field numbers > 2**28.
31b3528424 Merge pull request #350 from haberman/encode-depthlimit
e9551022c1 Added depth limit checking to upb_encode().
f389384c5a Merge pull request #349 from lidizheng/json-public
f72c26cbc4 Make :json publically visible
5797d95172 Merge pull request #348 from haberman/json-emit-defaults
7a17493269 Removed print debugging.
695b7f4617 Added code to test UPB_JSONENC_EMITDEFAULTS.
6b357607bd Fixed bugs in JSON encoding with UPB_JSONENC_EMITDEFAULTS.
1b08391979 Merge pull request #347 from haberman/filedef-symtab
ee49a8d7df Added an accessor to get the symtab from a filedef.
a81b47025a Merge pull request #345 from haberman/encode-skipunknown
6535cbe380 Merge pull request #346 from timgates42/bugfix_typo_position
7225108720 docs: fix simple typo, posisiton -> position
871ff96252 Test SKIPUNKNOWN on regular fields.
0569c22a1e Removed debug print.
76764643ac Added option to binary encoder to skip unknown fields.
794ce6d061 Merge pull request #344 from haberman/deterministic-serialize
a04627abc8 Added map sorting to binary and text encoders.
3e071ea91a Merge pull request #343 from haberman/msvc
e70e488e09 MSVC apparently doesn't support the standard C/C++ defines.
963e501aa6 Merge pull request #342 from haberman/fuzz
8d670d8aea Renamed decode_varint32() to decode_tag().
9abf8e043f Clamp 32-bit varints to 5 bytes to fix a fuzz failure.
50a543de7f Merge pull request #341 from haberman/code-size
9c87f1168f Added size benchmark for CODE_SIZE.
6f82028236 Merge pull request #340 from haberman/darwin-setjmp
358fa14d0e Fixed headers and updated benchmark script.
bc200451ce Use a macro instead of an inline function for setjmp/longjmp.
ca279f8afa Merge branch 'master' into darwin-setjmp
fbc0639b07 Use _setjmp on mac to avoid saving/restoring the signal mask.
10f0a38450 Merge pull request #337 from haberman/size-benchmarks
4be07a2dce Increase build timeout until we can parallelize the build.
378a27b640 Force "size" to run locally.
da48e01f05 More google3 fixes.
d2446fd2db Moved cc_api_version attribute to proto_library().
4a84390c89 Added cc_proto_library() tweaks for google3.
4dd4212a34 Merge branch 'master' into size-benchmarks
ffecfef161 Merge branch 'master' into size-benchmarks
86f671d5fd Fix for Darwin (output is different, but it won't error out).
165e01ec6f Fix for old Python versions.
40fdff5e43 Merge pull request #339 from haberman/benchmark-alias
5f8bb5de1d Updated generated code.
65d166a6ba Added API for copy vs. alias and added benchmarks to test both.
27b9c999a7 Merge pull request #338 from haberman/arena-initial
9df96874e9 Start arena block doubling at initial block size.
881ddac7fe Also use .format() for gen_synthetic_protos.py.
8b7dabe1a2 Use format() instead of string interpolation, for old Python versions.
8e08282c3b Removed unused small.proto.
0f79d47215 Added missing lite binaries to size_data.txt.
555fbbc0bc Size benchmarks are working pretty well.
85cbc41a89 Merge branch 'master' into size-benchmarks
e5bdfba92c Removed accidentally-added .orig file.
07851fac58 Merge pull request #336 from haberman/fuzz
982b634bc5 Fixed a few minor bugs found by fuzzing.
c9d2e58480 Merge pull request #310 from haberman/fast-table
a01f3e23a4 Fixes for google3 build, and exclude even more tests from macOS to avoid timeout.
a83d55ee4b Exclude Clang tests from MacOS to avoid Kokoro timeouts.
73fcfe9ed0 Tried to slim down the tests a bit more.
baab25b7aa Removed excess/redundant tests from Kokoro script.
1eb7bd39e7 Some formatting fixes.
9d87055ce4 Updated Kokoro build script.
4bd34da105 WIP.
a7993615bf Merge branch 'master' into fast-table
3a3efe69a2 Added incompatible_use_toolchain_transition = True per https://github.com/bazelbuild/bazel/issues/11584
7b4e376f79 Switch unordered_set -> absl::flat_hash_set.
fe62fc83e1 Removed obsolete includes in benchmark.
5ed089dc42 Merge pull request #335 from haberman/wyhash-rule
e9b79542ad Added a BUILD file for wyhash.
7b8ae7ec4e Merge branch 'master' into size-benchmarks
a5b5445da6 Merge pull request #334 from haberman/rm-port-c
6c16cba83f Removed obsolete port.c file.
484d8f746a Updated comment in wyhash.h to correct spelling mistake.
6a9d0f45b8 Merge pull request #333 from haberman/32bitfixes
5b1f0d86a1 For Kokoro, only build/test -m32 on Linux.
0497f8deed Fixed a critical bug on 32-bit builds, and added much more Kokoro testing.
7543f851f1 Merge pull request #332 from haberman/php-amalgamation
64abb5eb11 Amalgamation no longer bundles wyhash, but #includes it.
a2a40792b5 Merge pull request #331 from haberman/json-oneof-fix
dd0994d377 Bugfix for JSON decoding: only check real oneofs for duplicates.
496f638025 Merge pull request #330 from haberman/symtab-longjmp
c9f9668234 symtab: use longjmp() for errors and avoid intermediate table.
4d9a8cd67b Merge branch 'master' into symtab-longjmp
6322d1d72d Merge pull request #329 from haberman/benchmark-ads-descriptor
5ec1d39224 Avoid building .pb.cc for ads protos, as C++ takes forever to compile.
43c207ea7e Added CMake dummy rule.
c3b5637646 Added benchmark for loading ads descriptor.
acd72c6d3f WIP.
6ae3b66cd2 Merge pull request #328 from haberman/optdefload
8113ebd6c7 Added explanatory comment about integer constants.
f2d826b9f3 Got rid of floating-point division in table init.
723cd8ffc1 Added wyhash code and LICENSE, and removed temporary benchmark.
15e20636c3 Merge branch 'master' into optdefload
154f2c25f4 Added UTF-8 validation for proto3 string fields.
e8f9eac68c Added #defines UPB_ENABLE_FASTTABLE and UPB_TRY_ENABLE_FASTTABLE.
994cf07cf3 Merge pull request #327 from benjaminp/modern-linking
b5bd5807a7 Migrate to modern Starlark linking api.
dc64613607 Merge branch 'fastest-table' into fast-table
e86541ac1d Fixed the build after the merge.
1cd0cb17d3 Merge branch 'master' into fastest-table
901744a97e Merge pull request #326 from haberman/c99
a0d16e7073 Added a few missing copts, and made some functions proper prototypes.
558315a1c3 Added COPTS to :port.
7e5bd65098 Plumbed copts (including the crucial -std=c99) to upb_proto_library() aspect.
8f3ee80d46 Drop C89/C90 support and MSVC prior to Visual Studio 2015.
a274ad786a Plumbed copts (including the crucial -std=c99) to upb_proto_library() aspect.
2c8bb6dd9d Specify C99 explicitly until/unless we stop using bool.
efd576b698 Added -std=gnu99 for fastdecode and ran Buildifier.
b928696942 A few more fixes, and test fastdecode under Kokoro.
55f3569cd2 A few minor fixes and more assertions.
8b38e8f214 Merge branch 'fastest-table' into fast-table
46eb82467a Added comment to decode_fast.h.
bd9f8f580d Fixed a few bugs with the fast decoder.
3eba47914b Allocate hasbits and table slots in "hotness" order.
021db6fcd5 Allow larger tags into the table if they are unique mod 31.
86d9908c55 Fastdecode support for packed fields.
e3e797b680 Added fasttable support for oneofs.
7ffa9c181a Fixed some small bugs and performance problems in string copying.
e2c709e047 Repeated string and primitive support.
e9103eda9e Merge branch 'master' into fastest-table
0756999ab6 Merge pull request #325 from haberman/inlined-arena
25db40bc30 Fixed upb::InlinedArena, which was compeltely broken.
d81ba58215 Optimized short string copying.
f3a2a79349 More optimization, back up to 2.56GB/s.
199c914295 Simplify push/pop when msg fits in the current buffer.
d5f5db2729 Put string-copying field parser into a separate function.
883f20d4dc Merge branch 'master' into fastest-table
1bd62e8218 Merge pull request #324 from haberman/simplemomi
f4adbe0698 Optimized varint decoding from Gerben.
48689df72e Eliminated bounds checks inside parsing a field.
a345af9883 Added a codegen parameter for whether fasttables are generated or not.
8a3470c543 WIP.
8e8dbb5258 Merge branch 'fastest-table' into fast-table
7d17a0e8c5 Merge branch 'master' into fastest-table
a7e2e8338d Fixed benchmark script.
72de7b7002 Merge branch 'fastest-table' into fast-table
cb234e652c Merge branch 'master' into fastest-table
b86cf2d789 Merge pull request #323 from haberman/build-files
4ea81ab107 Fixed pedantic warning.
6399b31f4b Removed ULL constants in json_decode.c.
c8ae197e64 Removed "U" suffixes, they are not necessary.
bc1e0b314f Fixed some strict C89 errors.
2c1664906a Removed license comments and upb_amalgamation for google3.
b7dc77415a Added licenses() to all BUILD files.
de22764b33 Updated Kokoro to test ... instead of :all.
e3f41de6c7 Split monolithic BUILD file into many build files.
fbe2bcafbc Merge pull request #4 from gerben-s/gerbens-fast-table
9e68ec033f Add repeated varints and fixed parsers
d0e4b688c6 Shorten name of kAliasString, so benchmark results don't wrap.
c0c9b5a168 Regenerated generated code.
eb8e6de8b7 Regenerated source files.
7f0d535826 Merge branch 'fastest-table' into fast-table
bf8e08074c Added a few more comments.
6e3c22e6ee Merge branch 'fastest-table' into fast-table
3238821315 Gave fast table entry a nicer name.
2a574d3d01 Added a bunch of comments for readability.
0deca8b8fb Merge branch 'master' into fast-table
bfadc99709 Merge branch 'master' into fastest-table
84e0f6127d Merge branch 'master' into fastest-table
61c51a607b Merge branch 'master' into fast-table
4f066765a9 Merge pull request #320 from haberman/string-view-benchmark
bf393bf086 Cleaned up benchmark names.
9eb8414b31 Added descriptor_sv.proto.
ee7da95367 Bzl formatting fix per buildifier.
de1b6b0718 Refactored proto2 benchmarks and added StringView benchmark.
c2901eeee1 Added missing #includes (caught by Blaze).
52721eadc7 Order LargeInitialBlock after non-initial-block test.
44a7130845 Used the correct copy of the protos in the benchmark.
3a242e7a48 Merge branch 'master' into fast-table
d01b712dbb Merge branch 'master' into fastest-table
d225dfc2ed Buildifier formatting fixes.
b0994a6501 Added missing dep from benchmark.
de80054018 Make required fields optional for benchmarking.
745661bf1f Merge branch 'master' into fastest-table
11585095b7 Merge pull request #319 from haberman/copy-descriptor
fd5a35d49d Minor comment changes.
bdd1a516e8 Fixed other tests.
27262adf93 Snapshot descriptor.proto into our own copy for benchmarking purposes.
d6b40fd5e2 Added missing dependency on reflection.
b9f1b67d07 Use quoted include.
1c8c16b9b1 Use quoted include.
4f901b6430 Passes all tests.
de84e20788 Merge branch 'master' into optdefload
d5c64476fd Merge pull request #318 from haberman/descriptor-load-benchmark
42d2f6cef9 Add MB/s measures in the benchmarks.
1ce98b86ec Added LoadDescriptor benchmark for proto2.
4890735ce2 Added benchmark for descriptor loading.
6f59f1256e Optimizations to descriptor loading.
6874d61704 Merge pull request #317 from haberman/gencode-compat
c81113e60f Added fallback code for when no enum matches.
c10b24ffb2 Simplified switch().
ded2e657a7 Added compatibility with old generated code.
5b0c5c7d4a Dispatch inline.
75edd3e59c Changed to use table pairs, seems to ever-so-slightly regress.
69d99a247e Merge pull request #3 from haberman/shifted-table
bca7edac8c Cleaned up table compression a bit.
b95f217996 A little speed boost, now hitting 2.51GB/s.
8ed6b2fe85 Stored mask in the table pointer.
a6dc88556d Tables are compressed, but perf goes down to 2.44GB/s.
91eb09b1bc Add a few comments.
7a1835d7c3 Merge branch 'master' into fast-table
8bd5c0088e Merge pull request #316 from haberman/submsg-array
a4966fd230 Added a few extra sanity checks.
99acbe0da8 Fixed bug where submsg array could have excess elements.
2a0425ecf5 Merge pull request #315 from haberman/conformance-fixes
7ccf5650c7 If we encounter "null" for a non-NullValue enum, throw an error.
0a3a94a12f Updated to a new version of protobuf and fixed a few conformance tests.
ddd5f28c4f Merge branch 'is_bazel'
10fa3a0c77 Merge pull request #314 from haberman/addunknown
504e105420 undef UPB_ASAN.
ab96d1ec41 Removed extraneous C++-style comment.
d5096f9ee8 Fixed bug in addunknown and added ASAN poisoning.
6fe84526be Mark _is_bazel to be replace in google3.
f01efe8b64 Removed another C99-ism.
1749082bbb Removed C99-ism.
147e363f56 Merge branch 'master' into fast-table
f2ddc15d76 Bugfix: initialize fastlimit and fastend.
65e49b694b Merge branch 'gerben-fast-table' into fast-table
1abf7d418d Added generated files.
3f719fa6b2 Bugfix: offsetting hasbits with 16 introduced a bug in calculating hasmasks. Removing extra <<16 shift in hasmask calculating and masking out the first 16 bits. This makes messages without hasbits work as well.
aec762e405 Merge branch 'master' into fast-table
4f77aaafd8 Merge pull request #2 from gerben-s/fast-table
4053805759 Bugfixes
d1cd80385b Merge pull request #313 from haberman/inline-arena
ad21083623 Merge pull request #313 from haberman/inline-arena
2339fc779c Updated obsolete comment.
b393849bbd Updated obsolete comment.
ebe53f8590 Fixed compile error.
b37f82b58b Fixed compile error.
71749b7caf Implemented inline array allocation, and moved type->lg2 map to reflection.
9557b97acc Implemented inline array allocation, and moved type->lg2 map to reflection.
b58d2a0ee6 Shrink overhead of message representation.
0bf063a2ca Shrink overhead of message representation.
d87ceeacab Shave off one more store.
ddc52ab9d6 Shave off one more store.
c25d895adf Shrunk the arena state that needs to be synced.
7f67f68c1c Shrunk the arena state that needs to be synced.
ff40dd6ea9 Added new internal header.
85a43e5461 Added new internal header.
36662b3735 Refactor some code. I extracted some common code from all message field parsers, to a tail recursive function. Removed the varint jmp table for a simple varint parse loop, that removes the stack frames. Also careful with not losing information in repeated message tag check. When written mindful the checks and loads that happen can be reused for tag dispatch if not the expected tag.
cbcd635917 Fixed memory leak.
bcbcdadbd2 Fixed memory leak.
e5264bd794 Merge pull request #312 from haberman/defiter
52957fa984 Merge pull request #312 from haberman/defiter
746f64692c Moved arena inline for decoder.
7363b91ac3 Moved arena inline for decoder.
b8ef1dcc57 Removed C++-style comments.
575acd85bd Re-added const for all of the pointer wrapper types.
5aa5b77b41 Added simple offset-based accessors for defs, and deprecated old iterators.
33384301e2 Merge pull request #311 from haberman/proto2-benchmark2
578e7c1f4c Merge pull request #311 from haberman/proto2-benchmark2
bc301e7da4 Use merge/partial variants to give proto2 benchmark the fairest hearing.
30f01afa83 Added LargeInitialBlock test for proto2.
5d23fd99af Used shorter protobuf:: namespace alias.
9938cf8f27 Put submsg_index directly in table data. Drop oneof support for now to focus.
d87179501d Another build fix.
89bd8b87e1 Fixed a few more C89 compat issues.
64d293894a Fixed bug introduced by last optimization.
ff957b996c Fixed C89 compat issues.
537b6f42c2 A few updates to the benchamrk and minor implementation changes.
0dcc5641eb Replicated dispatch and implemeted array resizing logic. Up to 2.67GB/s.
526e430794 I think this may have reached the optimization limit.
4c65b25daf Handle long varints, now 2GB/s!
e39ec95ca2 Hoisted updates to limits and depth out of the loop.
52a0ed3891 Fixed a bug with tag number 15.
388b6f64eb A small optimization: don't increment array length every iteration.
9e5c5ce089 Optimized memset() with cutoff and fixed group & unknown message bugs.
8dd7b5a2ca A bunch more optimization.
e46e94ec7f Added benchmarks for proto2.
405e7934b1 Handle 2-byte submessage lengths.
88b1ec7784 Table-driven supports repeated sub-messages.
f173642db4 Handle non-repeated submessages.
e219a2d91d Merge branch 'decode-arena' into fast-table
7ec2c52346 Donate/steal from arena to accelerate decoding.
d43ccfa079 Revert test changes.
fac992db83 Cleanup for showing.
3937874a85 We have a properly structured algorithm, but perf regresses by 20%.
438ecaeb5a Give all field parsers a generic table entry.
383ae5293e WIP.
26abaa2345 WIP.
34b98bc030 Avoid passing too many params to fallback.
763a3f6293 WIP.
02ff6fb996 Merge pull request #309 from haberman/decoder-forceinline
a202ce9629 Add UPB_FORCEINLINE for varint32 decoding.
d0f2c4c8a2 Merge pull request #308 from haberman/encoder
5741eb9ad7 Expanded benchmarking script and added one size opt to the encoder.
0135399e60 Fixed bug introduced in refactoring.
df3438222b Notated impossible branch as unreachable.
9b31e8fe12 Merged common encode tag paths.
5d7dc718cc Minor formatting fix.
80441e4eb4 Optimized binary encoder.
ada28896b9 Changed encoder to use longjmp() for error recovery.
6e140c267c Added benchmark for encoding.
7338facddb Merge pull request #307 from veblush/port-backport
4d2251c3e4 Add UPB_NORETURN for MSC
git-subtree-dir: third_party/upb
git-subtree-split: 60607da72e89ba0c84c84054d2e562d8b6b61177
4 years ago
|
|
|
output("\n");
|
|
|
|
|
|
|
|
for (int i = 0; i < file->dependency_count(); i++) {
|
|
|
|
output("extern _upb_DefPool_Init $0;\n",
|
|
|
|
DefInitSymbol(file->dependency(i)));
|
Squashed 'third_party/upb/' changes from 382d5afc60..60607da72e
60607da72e Merge pull request #356 from haberman/codegen-uniquefiles
7a54a5f3d6 Split the code generators for .upb and .upbdefs.
b10b02f66f Merge pull request #353 from haberman/small-fixes
cd7c2d2701 Merge pull request #352 from haberman/large-field-number
10b355a6e0 A couple minor fixes. These are exercised by Ruby.
6c30b5fe73 Fixed upb encoder for field numbers > 2**28.
31b3528424 Merge pull request #350 from haberman/encode-depthlimit
e9551022c1 Added depth limit checking to upb_encode().
f389384c5a Merge pull request #349 from lidizheng/json-public
f72c26cbc4 Make :json publically visible
5797d95172 Merge pull request #348 from haberman/json-emit-defaults
7a17493269 Removed print debugging.
695b7f4617 Added code to test UPB_JSONENC_EMITDEFAULTS.
6b357607bd Fixed bugs in JSON encoding with UPB_JSONENC_EMITDEFAULTS.
1b08391979 Merge pull request #347 from haberman/filedef-symtab
ee49a8d7df Added an accessor to get the symtab from a filedef.
a81b47025a Merge pull request #345 from haberman/encode-skipunknown
6535cbe380 Merge pull request #346 from timgates42/bugfix_typo_position
7225108720 docs: fix simple typo, posisiton -> position
871ff96252 Test SKIPUNKNOWN on regular fields.
0569c22a1e Removed debug print.
76764643ac Added option to binary encoder to skip unknown fields.
794ce6d061 Merge pull request #344 from haberman/deterministic-serialize
a04627abc8 Added map sorting to binary and text encoders.
3e071ea91a Merge pull request #343 from haberman/msvc
e70e488e09 MSVC apparently doesn't support the standard C/C++ defines.
963e501aa6 Merge pull request #342 from haberman/fuzz
8d670d8aea Renamed decode_varint32() to decode_tag().
9abf8e043f Clamp 32-bit varints to 5 bytes to fix a fuzz failure.
50a543de7f Merge pull request #341 from haberman/code-size
9c87f1168f Added size benchmark for CODE_SIZE.
6f82028236 Merge pull request #340 from haberman/darwin-setjmp
358fa14d0e Fixed headers and updated benchmark script.
bc200451ce Use a macro instead of an inline function for setjmp/longjmp.
ca279f8afa Merge branch 'master' into darwin-setjmp
fbc0639b07 Use _setjmp on mac to avoid saving/restoring the signal mask.
10f0a38450 Merge pull request #337 from haberman/size-benchmarks
4be07a2dce Increase build timeout until we can parallelize the build.
378a27b640 Force "size" to run locally.
da48e01f05 More google3 fixes.
d2446fd2db Moved cc_api_version attribute to proto_library().
4a84390c89 Added cc_proto_library() tweaks for google3.
4dd4212a34 Merge branch 'master' into size-benchmarks
ffecfef161 Merge branch 'master' into size-benchmarks
86f671d5fd Fix for Darwin (output is different, but it won't error out).
165e01ec6f Fix for old Python versions.
40fdff5e43 Merge pull request #339 from haberman/benchmark-alias
5f8bb5de1d Updated generated code.
65d166a6ba Added API for copy vs. alias and added benchmarks to test both.
27b9c999a7 Merge pull request #338 from haberman/arena-initial
9df96874e9 Start arena block doubling at initial block size.
881ddac7fe Also use .format() for gen_synthetic_protos.py.
8b7dabe1a2 Use format() instead of string interpolation, for old Python versions.
8e08282c3b Removed unused small.proto.
0f79d47215 Added missing lite binaries to size_data.txt.
555fbbc0bc Size benchmarks are working pretty well.
85cbc41a89 Merge branch 'master' into size-benchmarks
e5bdfba92c Removed accidentally-added .orig file.
07851fac58 Merge pull request #336 from haberman/fuzz
982b634bc5 Fixed a few minor bugs found by fuzzing.
c9d2e58480 Merge pull request #310 from haberman/fast-table
a01f3e23a4 Fixes for google3 build, and exclude even more tests from macOS to avoid timeout.
a83d55ee4b Exclude Clang tests from MacOS to avoid Kokoro timeouts.
73fcfe9ed0 Tried to slim down the tests a bit more.
baab25b7aa Removed excess/redundant tests from Kokoro script.
1eb7bd39e7 Some formatting fixes.
9d87055ce4 Updated Kokoro build script.
4bd34da105 WIP.
a7993615bf Merge branch 'master' into fast-table
3a3efe69a2 Added incompatible_use_toolchain_transition = True per https://github.com/bazelbuild/bazel/issues/11584
7b4e376f79 Switch unordered_set -> absl::flat_hash_set.
fe62fc83e1 Removed obsolete includes in benchmark.
5ed089dc42 Merge pull request #335 from haberman/wyhash-rule
e9b79542ad Added a BUILD file for wyhash.
7b8ae7ec4e Merge branch 'master' into size-benchmarks
a5b5445da6 Merge pull request #334 from haberman/rm-port-c
6c16cba83f Removed obsolete port.c file.
484d8f746a Updated comment in wyhash.h to correct spelling mistake.
6a9d0f45b8 Merge pull request #333 from haberman/32bitfixes
5b1f0d86a1 For Kokoro, only build/test -m32 on Linux.
0497f8deed Fixed a critical bug on 32-bit builds, and added much more Kokoro testing.
7543f851f1 Merge pull request #332 from haberman/php-amalgamation
64abb5eb11 Amalgamation no longer bundles wyhash, but #includes it.
a2a40792b5 Merge pull request #331 from haberman/json-oneof-fix
dd0994d377 Bugfix for JSON decoding: only check real oneofs for duplicates.
496f638025 Merge pull request #330 from haberman/symtab-longjmp
c9f9668234 symtab: use longjmp() for errors and avoid intermediate table.
4d9a8cd67b Merge branch 'master' into symtab-longjmp
6322d1d72d Merge pull request #329 from haberman/benchmark-ads-descriptor
5ec1d39224 Avoid building .pb.cc for ads protos, as C++ takes forever to compile.
43c207ea7e Added CMake dummy rule.
c3b5637646 Added benchmark for loading ads descriptor.
acd72c6d3f WIP.
6ae3b66cd2 Merge pull request #328 from haberman/optdefload
8113ebd6c7 Added explanatory comment about integer constants.
f2d826b9f3 Got rid of floating-point division in table init.
723cd8ffc1 Added wyhash code and LICENSE, and removed temporary benchmark.
15e20636c3 Merge branch 'master' into optdefload
154f2c25f4 Added UTF-8 validation for proto3 string fields.
e8f9eac68c Added #defines UPB_ENABLE_FASTTABLE and UPB_TRY_ENABLE_FASTTABLE.
994cf07cf3 Merge pull request #327 from benjaminp/modern-linking
b5bd5807a7 Migrate to modern Starlark linking api.
dc64613607 Merge branch 'fastest-table' into fast-table
e86541ac1d Fixed the build after the merge.
1cd0cb17d3 Merge branch 'master' into fastest-table
901744a97e Merge pull request #326 from haberman/c99
a0d16e7073 Added a few missing copts, and made some functions proper prototypes.
558315a1c3 Added COPTS to :port.
7e5bd65098 Plumbed copts (including the crucial -std=c99) to upb_proto_library() aspect.
8f3ee80d46 Drop C89/C90 support and MSVC prior to Visual Studio 2015.
a274ad786a Plumbed copts (including the crucial -std=c99) to upb_proto_library() aspect.
2c8bb6dd9d Specify C99 explicitly until/unless we stop using bool.
efd576b698 Added -std=gnu99 for fastdecode and ran Buildifier.
b928696942 A few more fixes, and test fastdecode under Kokoro.
55f3569cd2 A few minor fixes and more assertions.
8b38e8f214 Merge branch 'fastest-table' into fast-table
46eb82467a Added comment to decode_fast.h.
bd9f8f580d Fixed a few bugs with the fast decoder.
3eba47914b Allocate hasbits and table slots in "hotness" order.
021db6fcd5 Allow larger tags into the table if they are unique mod 31.
86d9908c55 Fastdecode support for packed fields.
e3e797b680 Added fasttable support for oneofs.
7ffa9c181a Fixed some small bugs and performance problems in string copying.
e2c709e047 Repeated string and primitive support.
e9103eda9e Merge branch 'master' into fastest-table
0756999ab6 Merge pull request #325 from haberman/inlined-arena
25db40bc30 Fixed upb::InlinedArena, which was compeltely broken.
d81ba58215 Optimized short string copying.
f3a2a79349 More optimization, back up to 2.56GB/s.
199c914295 Simplify push/pop when msg fits in the current buffer.
d5f5db2729 Put string-copying field parser into a separate function.
883f20d4dc Merge branch 'master' into fastest-table
1bd62e8218 Merge pull request #324 from haberman/simplemomi
f4adbe0698 Optimized varint decoding from Gerben.
48689df72e Eliminated bounds checks inside parsing a field.
a345af9883 Added a codegen parameter for whether fasttables are generated or not.
8a3470c543 WIP.
8e8dbb5258 Merge branch 'fastest-table' into fast-table
7d17a0e8c5 Merge branch 'master' into fastest-table
a7e2e8338d Fixed benchmark script.
72de7b7002 Merge branch 'fastest-table' into fast-table
cb234e652c Merge branch 'master' into fastest-table
b86cf2d789 Merge pull request #323 from haberman/build-files
4ea81ab107 Fixed pedantic warning.
6399b31f4b Removed ULL constants in json_decode.c.
c8ae197e64 Removed "U" suffixes, they are not necessary.
bc1e0b314f Fixed some strict C89 errors.
2c1664906a Removed license comments and upb_amalgamation for google3.
b7dc77415a Added licenses() to all BUILD files.
de22764b33 Updated Kokoro to test ... instead of :all.
e3f41de6c7 Split monolithic BUILD file into many build files.
fbe2bcafbc Merge pull request #4 from gerben-s/gerbens-fast-table
9e68ec033f Add repeated varints and fixed parsers
d0e4b688c6 Shorten name of kAliasString, so benchmark results don't wrap.
c0c9b5a168 Regenerated generated code.
eb8e6de8b7 Regenerated source files.
7f0d535826 Merge branch 'fastest-table' into fast-table
bf8e08074c Added a few more comments.
6e3c22e6ee Merge branch 'fastest-table' into fast-table
3238821315 Gave fast table entry a nicer name.
2a574d3d01 Added a bunch of comments for readability.
0deca8b8fb Merge branch 'master' into fast-table
bfadc99709 Merge branch 'master' into fastest-table
84e0f6127d Merge branch 'master' into fastest-table
61c51a607b Merge branch 'master' into fast-table
4f066765a9 Merge pull request #320 from haberman/string-view-benchmark
bf393bf086 Cleaned up benchmark names.
9eb8414b31 Added descriptor_sv.proto.
ee7da95367 Bzl formatting fix per buildifier.
de1b6b0718 Refactored proto2 benchmarks and added StringView benchmark.
c2901eeee1 Added missing #includes (caught by Blaze).
52721eadc7 Order LargeInitialBlock after non-initial-block test.
44a7130845 Used the correct copy of the protos in the benchmark.
3a242e7a48 Merge branch 'master' into fast-table
d01b712dbb Merge branch 'master' into fastest-table
d225dfc2ed Buildifier formatting fixes.
b0994a6501 Added missing dep from benchmark.
de80054018 Make required fields optional for benchmarking.
745661bf1f Merge branch 'master' into fastest-table
11585095b7 Merge pull request #319 from haberman/copy-descriptor
fd5a35d49d Minor comment changes.
bdd1a516e8 Fixed other tests.
27262adf93 Snapshot descriptor.proto into our own copy for benchmarking purposes.
d6b40fd5e2 Added missing dependency on reflection.
b9f1b67d07 Use quoted include.
1c8c16b9b1 Use quoted include.
4f901b6430 Passes all tests.
de84e20788 Merge branch 'master' into optdefload
d5c64476fd Merge pull request #318 from haberman/descriptor-load-benchmark
42d2f6cef9 Add MB/s measures in the benchmarks.
1ce98b86ec Added LoadDescriptor benchmark for proto2.
4890735ce2 Added benchmark for descriptor loading.
6f59f1256e Optimizations to descriptor loading.
6874d61704 Merge pull request #317 from haberman/gencode-compat
c81113e60f Added fallback code for when no enum matches.
c10b24ffb2 Simplified switch().
ded2e657a7 Added compatibility with old generated code.
5b0c5c7d4a Dispatch inline.
75edd3e59c Changed to use table pairs, seems to ever-so-slightly regress.
69d99a247e Merge pull request #3 from haberman/shifted-table
bca7edac8c Cleaned up table compression a bit.
b95f217996 A little speed boost, now hitting 2.51GB/s.
8ed6b2fe85 Stored mask in the table pointer.
a6dc88556d Tables are compressed, but perf goes down to 2.44GB/s.
91eb09b1bc Add a few comments.
7a1835d7c3 Merge branch 'master' into fast-table
8bd5c0088e Merge pull request #316 from haberman/submsg-array
a4966fd230 Added a few extra sanity checks.
99acbe0da8 Fixed bug where submsg array could have excess elements.
2a0425ecf5 Merge pull request #315 from haberman/conformance-fixes
7ccf5650c7 If we encounter "null" for a non-NullValue enum, throw an error.
0a3a94a12f Updated to a new version of protobuf and fixed a few conformance tests.
ddd5f28c4f Merge branch 'is_bazel'
10fa3a0c77 Merge pull request #314 from haberman/addunknown
504e105420 undef UPB_ASAN.
ab96d1ec41 Removed extraneous C++-style comment.
d5096f9ee8 Fixed bug in addunknown and added ASAN poisoning.
6fe84526be Mark _is_bazel to be replace in google3.
f01efe8b64 Removed another C99-ism.
1749082bbb Removed C99-ism.
147e363f56 Merge branch 'master' into fast-table
f2ddc15d76 Bugfix: initialize fastlimit and fastend.
65e49b694b Merge branch 'gerben-fast-table' into fast-table
1abf7d418d Added generated files.
3f719fa6b2 Bugfix: offsetting hasbits with 16 introduced a bug in calculating hasmasks. Removing extra <<16 shift in hasmask calculating and masking out the first 16 bits. This makes messages without hasbits work as well.
aec762e405 Merge branch 'master' into fast-table
4f77aaafd8 Merge pull request #2 from gerben-s/fast-table
4053805759 Bugfixes
d1cd80385b Merge pull request #313 from haberman/inline-arena
ad21083623 Merge pull request #313 from haberman/inline-arena
2339fc779c Updated obsolete comment.
b393849bbd Updated obsolete comment.
ebe53f8590 Fixed compile error.
b37f82b58b Fixed compile error.
71749b7caf Implemented inline array allocation, and moved type->lg2 map to reflection.
9557b97acc Implemented inline array allocation, and moved type->lg2 map to reflection.
b58d2a0ee6 Shrink overhead of message representation.
0bf063a2ca Shrink overhead of message representation.
d87ceeacab Shave off one more store.
ddc52ab9d6 Shave off one more store.
c25d895adf Shrunk the arena state that needs to be synced.
7f67f68c1c Shrunk the arena state that needs to be synced.
ff40dd6ea9 Added new internal header.
85a43e5461 Added new internal header.
36662b3735 Refactor some code. I extracted some common code from all message field parsers, to a tail recursive function. Removed the varint jmp table for a simple varint parse loop, that removes the stack frames. Also careful with not losing information in repeated message tag check. When written mindful the checks and loads that happen can be reused for tag dispatch if not the expected tag.
cbcd635917 Fixed memory leak.
bcbcdadbd2 Fixed memory leak.
e5264bd794 Merge pull request #312 from haberman/defiter
52957fa984 Merge pull request #312 from haberman/defiter
746f64692c Moved arena inline for decoder.
7363b91ac3 Moved arena inline for decoder.
b8ef1dcc57 Removed C++-style comments.
575acd85bd Re-added const for all of the pointer wrapper types.
5aa5b77b41 Added simple offset-based accessors for defs, and deprecated old iterators.
33384301e2 Merge pull request #311 from haberman/proto2-benchmark2
578e7c1f4c Merge pull request #311 from haberman/proto2-benchmark2
bc301e7da4 Use merge/partial variants to give proto2 benchmark the fairest hearing.
30f01afa83 Added LargeInitialBlock test for proto2.
5d23fd99af Used shorter protobuf:: namespace alias.
9938cf8f27 Put submsg_index directly in table data. Drop oneof support for now to focus.
d87179501d Another build fix.
89bd8b87e1 Fixed a few more C89 compat issues.
64d293894a Fixed bug introduced by last optimization.
ff957b996c Fixed C89 compat issues.
537b6f42c2 A few updates to the benchamrk and minor implementation changes.
0dcc5641eb Replicated dispatch and implemeted array resizing logic. Up to 2.67GB/s.
526e430794 I think this may have reached the optimization limit.
4c65b25daf Handle long varints, now 2GB/s!
e39ec95ca2 Hoisted updates to limits and depth out of the loop.
52a0ed3891 Fixed a bug with tag number 15.
388b6f64eb A small optimization: don't increment array length every iteration.
9e5c5ce089 Optimized memset() with cutoff and fixed group & unknown message bugs.
8dd7b5a2ca A bunch more optimization.
e46e94ec7f Added benchmarks for proto2.
405e7934b1 Handle 2-byte submessage lengths.
88b1ec7784 Table-driven supports repeated sub-messages.
f173642db4 Handle non-repeated submessages.
e219a2d91d Merge branch 'decode-arena' into fast-table
7ec2c52346 Donate/steal from arena to accelerate decoding.
d43ccfa079 Revert test changes.
fac992db83 Cleanup for showing.
3937874a85 We have a properly structured algorithm, but perf regresses by 20%.
438ecaeb5a Give all field parsers a generic table entry.
383ae5293e WIP.
26abaa2345 WIP.
34b98bc030 Avoid passing too many params to fallback.
763a3f6293 WIP.
02ff6fb996 Merge pull request #309 from haberman/decoder-forceinline
a202ce9629 Add UPB_FORCEINLINE for varint32 decoding.
d0f2c4c8a2 Merge pull request #308 from haberman/encoder
5741eb9ad7 Expanded benchmarking script and added one size opt to the encoder.
0135399e60 Fixed bug introduced in refactoring.
df3438222b Notated impossible branch as unreachable.
9b31e8fe12 Merged common encode tag paths.
5d7dc718cc Minor formatting fix.
80441e4eb4 Optimized binary encoder.
ada28896b9 Changed encoder to use longjmp() for error recovery.
6e140c267c Added benchmark for encoding.
7338facddb Merge pull request #307 from veblush/port-backport
4d2251c3e4 Add UPB_NORETURN for MSC
git-subtree-dir: third_party/upb
git-subtree-split: 60607da72e89ba0c84c84054d2e562d8b6b61177
4 years ago
|
|
|
}
|
|
|
|
|
|
|
|
protobuf::FileDescriptorProto file_proto;
|
|
|
|
file->CopyTo(&file_proto);
|
|
|
|
std::string file_data;
|
|
|
|
file_proto.SerializeToString(&file_data);
|
|
|
|
|
|
|
|
output("static const char descriptor[$0] = {", file_data.size());
|
|
|
|
|
|
|
|
// C90 only guarantees that strings can be up to 509 characters, and some
|
|
|
|
// implementations have limits here (for example, MSVC only allows 64k:
|
|
|
|
// https://docs.microsoft.com/en-us/cpp/error-messages/compiler-errors-1/fatal-error-c1091.
|
|
|
|
// So we always emit an array instead of a string.
|
|
|
|
for (size_t i = 0; i < file_data.size();) {
|
|
|
|
for (size_t j = 0; j < 25 && i < file_data.size(); ++i, ++j) {
|
|
|
|
output("'$0', ", absl::CEscape(file_data.substr(i, 1)));
|
|
|
|
}
|
|
|
|
output("\n");
|
|
|
|
}
|
|
|
|
output("};\n\n");
|
|
|
|
|
|
|
|
output("static _upb_DefPool_Init *deps[$0] = {\n",
|
|
|
|
file->dependency_count() + 1);
|
Squashed 'third_party/upb/' changes from 382d5afc60..60607da72e
60607da72e Merge pull request #356 from haberman/codegen-uniquefiles
7a54a5f3d6 Split the code generators for .upb and .upbdefs.
b10b02f66f Merge pull request #353 from haberman/small-fixes
cd7c2d2701 Merge pull request #352 from haberman/large-field-number
10b355a6e0 A couple minor fixes. These are exercised by Ruby.
6c30b5fe73 Fixed upb encoder for field numbers > 2**28.
31b3528424 Merge pull request #350 from haberman/encode-depthlimit
e9551022c1 Added depth limit checking to upb_encode().
f389384c5a Merge pull request #349 from lidizheng/json-public
f72c26cbc4 Make :json publically visible
5797d95172 Merge pull request #348 from haberman/json-emit-defaults
7a17493269 Removed print debugging.
695b7f4617 Added code to test UPB_JSONENC_EMITDEFAULTS.
6b357607bd Fixed bugs in JSON encoding with UPB_JSONENC_EMITDEFAULTS.
1b08391979 Merge pull request #347 from haberman/filedef-symtab
ee49a8d7df Added an accessor to get the symtab from a filedef.
a81b47025a Merge pull request #345 from haberman/encode-skipunknown
6535cbe380 Merge pull request #346 from timgates42/bugfix_typo_position
7225108720 docs: fix simple typo, posisiton -> position
871ff96252 Test SKIPUNKNOWN on regular fields.
0569c22a1e Removed debug print.
76764643ac Added option to binary encoder to skip unknown fields.
794ce6d061 Merge pull request #344 from haberman/deterministic-serialize
a04627abc8 Added map sorting to binary and text encoders.
3e071ea91a Merge pull request #343 from haberman/msvc
e70e488e09 MSVC apparently doesn't support the standard C/C++ defines.
963e501aa6 Merge pull request #342 from haberman/fuzz
8d670d8aea Renamed decode_varint32() to decode_tag().
9abf8e043f Clamp 32-bit varints to 5 bytes to fix a fuzz failure.
50a543de7f Merge pull request #341 from haberman/code-size
9c87f1168f Added size benchmark for CODE_SIZE.
6f82028236 Merge pull request #340 from haberman/darwin-setjmp
358fa14d0e Fixed headers and updated benchmark script.
bc200451ce Use a macro instead of an inline function for setjmp/longjmp.
ca279f8afa Merge branch 'master' into darwin-setjmp
fbc0639b07 Use _setjmp on mac to avoid saving/restoring the signal mask.
10f0a38450 Merge pull request #337 from haberman/size-benchmarks
4be07a2dce Increase build timeout until we can parallelize the build.
378a27b640 Force "size" to run locally.
da48e01f05 More google3 fixes.
d2446fd2db Moved cc_api_version attribute to proto_library().
4a84390c89 Added cc_proto_library() tweaks for google3.
4dd4212a34 Merge branch 'master' into size-benchmarks
ffecfef161 Merge branch 'master' into size-benchmarks
86f671d5fd Fix for Darwin (output is different, but it won't error out).
165e01ec6f Fix for old Python versions.
40fdff5e43 Merge pull request #339 from haberman/benchmark-alias
5f8bb5de1d Updated generated code.
65d166a6ba Added API for copy vs. alias and added benchmarks to test both.
27b9c999a7 Merge pull request #338 from haberman/arena-initial
9df96874e9 Start arena block doubling at initial block size.
881ddac7fe Also use .format() for gen_synthetic_protos.py.
8b7dabe1a2 Use format() instead of string interpolation, for old Python versions.
8e08282c3b Removed unused small.proto.
0f79d47215 Added missing lite binaries to size_data.txt.
555fbbc0bc Size benchmarks are working pretty well.
85cbc41a89 Merge branch 'master' into size-benchmarks
e5bdfba92c Removed accidentally-added .orig file.
07851fac58 Merge pull request #336 from haberman/fuzz
982b634bc5 Fixed a few minor bugs found by fuzzing.
c9d2e58480 Merge pull request #310 from haberman/fast-table
a01f3e23a4 Fixes for google3 build, and exclude even more tests from macOS to avoid timeout.
a83d55ee4b Exclude Clang tests from MacOS to avoid Kokoro timeouts.
73fcfe9ed0 Tried to slim down the tests a bit more.
baab25b7aa Removed excess/redundant tests from Kokoro script.
1eb7bd39e7 Some formatting fixes.
9d87055ce4 Updated Kokoro build script.
4bd34da105 WIP.
a7993615bf Merge branch 'master' into fast-table
3a3efe69a2 Added incompatible_use_toolchain_transition = True per https://github.com/bazelbuild/bazel/issues/11584
7b4e376f79 Switch unordered_set -> absl::flat_hash_set.
fe62fc83e1 Removed obsolete includes in benchmark.
5ed089dc42 Merge pull request #335 from haberman/wyhash-rule
e9b79542ad Added a BUILD file for wyhash.
7b8ae7ec4e Merge branch 'master' into size-benchmarks
a5b5445da6 Merge pull request #334 from haberman/rm-port-c
6c16cba83f Removed obsolete port.c file.
484d8f746a Updated comment in wyhash.h to correct spelling mistake.
6a9d0f45b8 Merge pull request #333 from haberman/32bitfixes
5b1f0d86a1 For Kokoro, only build/test -m32 on Linux.
0497f8deed Fixed a critical bug on 32-bit builds, and added much more Kokoro testing.
7543f851f1 Merge pull request #332 from haberman/php-amalgamation
64abb5eb11 Amalgamation no longer bundles wyhash, but #includes it.
a2a40792b5 Merge pull request #331 from haberman/json-oneof-fix
dd0994d377 Bugfix for JSON decoding: only check real oneofs for duplicates.
496f638025 Merge pull request #330 from haberman/symtab-longjmp
c9f9668234 symtab: use longjmp() for errors and avoid intermediate table.
4d9a8cd67b Merge branch 'master' into symtab-longjmp
6322d1d72d Merge pull request #329 from haberman/benchmark-ads-descriptor
5ec1d39224 Avoid building .pb.cc for ads protos, as C++ takes forever to compile.
43c207ea7e Added CMake dummy rule.
c3b5637646 Added benchmark for loading ads descriptor.
acd72c6d3f WIP.
6ae3b66cd2 Merge pull request #328 from haberman/optdefload
8113ebd6c7 Added explanatory comment about integer constants.
f2d826b9f3 Got rid of floating-point division in table init.
723cd8ffc1 Added wyhash code and LICENSE, and removed temporary benchmark.
15e20636c3 Merge branch 'master' into optdefload
154f2c25f4 Added UTF-8 validation for proto3 string fields.
e8f9eac68c Added #defines UPB_ENABLE_FASTTABLE and UPB_TRY_ENABLE_FASTTABLE.
994cf07cf3 Merge pull request #327 from benjaminp/modern-linking
b5bd5807a7 Migrate to modern Starlark linking api.
dc64613607 Merge branch 'fastest-table' into fast-table
e86541ac1d Fixed the build after the merge.
1cd0cb17d3 Merge branch 'master' into fastest-table
901744a97e Merge pull request #326 from haberman/c99
a0d16e7073 Added a few missing copts, and made some functions proper prototypes.
558315a1c3 Added COPTS to :port.
7e5bd65098 Plumbed copts (including the crucial -std=c99) to upb_proto_library() aspect.
8f3ee80d46 Drop C89/C90 support and MSVC prior to Visual Studio 2015.
a274ad786a Plumbed copts (including the crucial -std=c99) to upb_proto_library() aspect.
2c8bb6dd9d Specify C99 explicitly until/unless we stop using bool.
efd576b698 Added -std=gnu99 for fastdecode and ran Buildifier.
b928696942 A few more fixes, and test fastdecode under Kokoro.
55f3569cd2 A few minor fixes and more assertions.
8b38e8f214 Merge branch 'fastest-table' into fast-table
46eb82467a Added comment to decode_fast.h.
bd9f8f580d Fixed a few bugs with the fast decoder.
3eba47914b Allocate hasbits and table slots in "hotness" order.
021db6fcd5 Allow larger tags into the table if they are unique mod 31.
86d9908c55 Fastdecode support for packed fields.
e3e797b680 Added fasttable support for oneofs.
7ffa9c181a Fixed some small bugs and performance problems in string copying.
e2c709e047 Repeated string and primitive support.
e9103eda9e Merge branch 'master' into fastest-table
0756999ab6 Merge pull request #325 from haberman/inlined-arena
25db40bc30 Fixed upb::InlinedArena, which was compeltely broken.
d81ba58215 Optimized short string copying.
f3a2a79349 More optimization, back up to 2.56GB/s.
199c914295 Simplify push/pop when msg fits in the current buffer.
d5f5db2729 Put string-copying field parser into a separate function.
883f20d4dc Merge branch 'master' into fastest-table
1bd62e8218 Merge pull request #324 from haberman/simplemomi
f4adbe0698 Optimized varint decoding from Gerben.
48689df72e Eliminated bounds checks inside parsing a field.
a345af9883 Added a codegen parameter for whether fasttables are generated or not.
8a3470c543 WIP.
8e8dbb5258 Merge branch 'fastest-table' into fast-table
7d17a0e8c5 Merge branch 'master' into fastest-table
a7e2e8338d Fixed benchmark script.
72de7b7002 Merge branch 'fastest-table' into fast-table
cb234e652c Merge branch 'master' into fastest-table
b86cf2d789 Merge pull request #323 from haberman/build-files
4ea81ab107 Fixed pedantic warning.
6399b31f4b Removed ULL constants in json_decode.c.
c8ae197e64 Removed "U" suffixes, they are not necessary.
bc1e0b314f Fixed some strict C89 errors.
2c1664906a Removed license comments and upb_amalgamation for google3.
b7dc77415a Added licenses() to all BUILD files.
de22764b33 Updated Kokoro to test ... instead of :all.
e3f41de6c7 Split monolithic BUILD file into many build files.
fbe2bcafbc Merge pull request #4 from gerben-s/gerbens-fast-table
9e68ec033f Add repeated varints and fixed parsers
d0e4b688c6 Shorten name of kAliasString, so benchmark results don't wrap.
c0c9b5a168 Regenerated generated code.
eb8e6de8b7 Regenerated source files.
7f0d535826 Merge branch 'fastest-table' into fast-table
bf8e08074c Added a few more comments.
6e3c22e6ee Merge branch 'fastest-table' into fast-table
3238821315 Gave fast table entry a nicer name.
2a574d3d01 Added a bunch of comments for readability.
0deca8b8fb Merge branch 'master' into fast-table
bfadc99709 Merge branch 'master' into fastest-table
84e0f6127d Merge branch 'master' into fastest-table
61c51a607b Merge branch 'master' into fast-table
4f066765a9 Merge pull request #320 from haberman/string-view-benchmark
bf393bf086 Cleaned up benchmark names.
9eb8414b31 Added descriptor_sv.proto.
ee7da95367 Bzl formatting fix per buildifier.
de1b6b0718 Refactored proto2 benchmarks and added StringView benchmark.
c2901eeee1 Added missing #includes (caught by Blaze).
52721eadc7 Order LargeInitialBlock after non-initial-block test.
44a7130845 Used the correct copy of the protos in the benchmark.
3a242e7a48 Merge branch 'master' into fast-table
d01b712dbb Merge branch 'master' into fastest-table
d225dfc2ed Buildifier formatting fixes.
b0994a6501 Added missing dep from benchmark.
de80054018 Make required fields optional for benchmarking.
745661bf1f Merge branch 'master' into fastest-table
11585095b7 Merge pull request #319 from haberman/copy-descriptor
fd5a35d49d Minor comment changes.
bdd1a516e8 Fixed other tests.
27262adf93 Snapshot descriptor.proto into our own copy for benchmarking purposes.
d6b40fd5e2 Added missing dependency on reflection.
b9f1b67d07 Use quoted include.
1c8c16b9b1 Use quoted include.
4f901b6430 Passes all tests.
de84e20788 Merge branch 'master' into optdefload
d5c64476fd Merge pull request #318 from haberman/descriptor-load-benchmark
42d2f6cef9 Add MB/s measures in the benchmarks.
1ce98b86ec Added LoadDescriptor benchmark for proto2.
4890735ce2 Added benchmark for descriptor loading.
6f59f1256e Optimizations to descriptor loading.
6874d61704 Merge pull request #317 from haberman/gencode-compat
c81113e60f Added fallback code for when no enum matches.
c10b24ffb2 Simplified switch().
ded2e657a7 Added compatibility with old generated code.
5b0c5c7d4a Dispatch inline.
75edd3e59c Changed to use table pairs, seems to ever-so-slightly regress.
69d99a247e Merge pull request #3 from haberman/shifted-table
bca7edac8c Cleaned up table compression a bit.
b95f217996 A little speed boost, now hitting 2.51GB/s.
8ed6b2fe85 Stored mask in the table pointer.
a6dc88556d Tables are compressed, but perf goes down to 2.44GB/s.
91eb09b1bc Add a few comments.
7a1835d7c3 Merge branch 'master' into fast-table
8bd5c0088e Merge pull request #316 from haberman/submsg-array
a4966fd230 Added a few extra sanity checks.
99acbe0da8 Fixed bug where submsg array could have excess elements.
2a0425ecf5 Merge pull request #315 from haberman/conformance-fixes
7ccf5650c7 If we encounter "null" for a non-NullValue enum, throw an error.
0a3a94a12f Updated to a new version of protobuf and fixed a few conformance tests.
ddd5f28c4f Merge branch 'is_bazel'
10fa3a0c77 Merge pull request #314 from haberman/addunknown
504e105420 undef UPB_ASAN.
ab96d1ec41 Removed extraneous C++-style comment.
d5096f9ee8 Fixed bug in addunknown and added ASAN poisoning.
6fe84526be Mark _is_bazel to be replace in google3.
f01efe8b64 Removed another C99-ism.
1749082bbb Removed C99-ism.
147e363f56 Merge branch 'master' into fast-table
f2ddc15d76 Bugfix: initialize fastlimit and fastend.
65e49b694b Merge branch 'gerben-fast-table' into fast-table
1abf7d418d Added generated files.
3f719fa6b2 Bugfix: offsetting hasbits with 16 introduced a bug in calculating hasmasks. Removing extra <<16 shift in hasmask calculating and masking out the first 16 bits. This makes messages without hasbits work as well.
aec762e405 Merge branch 'master' into fast-table
4f77aaafd8 Merge pull request #2 from gerben-s/fast-table
4053805759 Bugfixes
d1cd80385b Merge pull request #313 from haberman/inline-arena
ad21083623 Merge pull request #313 from haberman/inline-arena
2339fc779c Updated obsolete comment.
b393849bbd Updated obsolete comment.
ebe53f8590 Fixed compile error.
b37f82b58b Fixed compile error.
71749b7caf Implemented inline array allocation, and moved type->lg2 map to reflection.
9557b97acc Implemented inline array allocation, and moved type->lg2 map to reflection.
b58d2a0ee6 Shrink overhead of message representation.
0bf063a2ca Shrink overhead of message representation.
d87ceeacab Shave off one more store.
ddc52ab9d6 Shave off one more store.
c25d895adf Shrunk the arena state that needs to be synced.
7f67f68c1c Shrunk the arena state that needs to be synced.
ff40dd6ea9 Added new internal header.
85a43e5461 Added new internal header.
36662b3735 Refactor some code. I extracted some common code from all message field parsers, to a tail recursive function. Removed the varint jmp table for a simple varint parse loop, that removes the stack frames. Also careful with not losing information in repeated message tag check. When written mindful the checks and loads that happen can be reused for tag dispatch if not the expected tag.
cbcd635917 Fixed memory leak.
bcbcdadbd2 Fixed memory leak.
e5264bd794 Merge pull request #312 from haberman/defiter
52957fa984 Merge pull request #312 from haberman/defiter
746f64692c Moved arena inline for decoder.
7363b91ac3 Moved arena inline for decoder.
b8ef1dcc57 Removed C++-style comments.
575acd85bd Re-added const for all of the pointer wrapper types.
5aa5b77b41 Added simple offset-based accessors for defs, and deprecated old iterators.
33384301e2 Merge pull request #311 from haberman/proto2-benchmark2
578e7c1f4c Merge pull request #311 from haberman/proto2-benchmark2
bc301e7da4 Use merge/partial variants to give proto2 benchmark the fairest hearing.
30f01afa83 Added LargeInitialBlock test for proto2.
5d23fd99af Used shorter protobuf:: namespace alias.
9938cf8f27 Put submsg_index directly in table data. Drop oneof support for now to focus.
d87179501d Another build fix.
89bd8b87e1 Fixed a few more C89 compat issues.
64d293894a Fixed bug introduced by last optimization.
ff957b996c Fixed C89 compat issues.
537b6f42c2 A few updates to the benchamrk and minor implementation changes.
0dcc5641eb Replicated dispatch and implemeted array resizing logic. Up to 2.67GB/s.
526e430794 I think this may have reached the optimization limit.
4c65b25daf Handle long varints, now 2GB/s!
e39ec95ca2 Hoisted updates to limits and depth out of the loop.
52a0ed3891 Fixed a bug with tag number 15.
388b6f64eb A small optimization: don't increment array length every iteration.
9e5c5ce089 Optimized memset() with cutoff and fixed group & unknown message bugs.
8dd7b5a2ca A bunch more optimization.
e46e94ec7f Added benchmarks for proto2.
405e7934b1 Handle 2-byte submessage lengths.
88b1ec7784 Table-driven supports repeated sub-messages.
f173642db4 Handle non-repeated submessages.
e219a2d91d Merge branch 'decode-arena' into fast-table
7ec2c52346 Donate/steal from arena to accelerate decoding.
d43ccfa079 Revert test changes.
fac992db83 Cleanup for showing.
3937874a85 We have a properly structured algorithm, but perf regresses by 20%.
438ecaeb5a Give all field parsers a generic table entry.
383ae5293e WIP.
26abaa2345 WIP.
34b98bc030 Avoid passing too many params to fallback.
763a3f6293 WIP.
02ff6fb996 Merge pull request #309 from haberman/decoder-forceinline
a202ce9629 Add UPB_FORCEINLINE for varint32 decoding.
d0f2c4c8a2 Merge pull request #308 from haberman/encoder
5741eb9ad7 Expanded benchmarking script and added one size opt to the encoder.
0135399e60 Fixed bug introduced in refactoring.
df3438222b Notated impossible branch as unreachable.
9b31e8fe12 Merged common encode tag paths.
5d7dc718cc Minor formatting fix.
80441e4eb4 Optimized binary encoder.
ada28896b9 Changed encoder to use longjmp() for error recovery.
6e140c267c Added benchmark for encoding.
7338facddb Merge pull request #307 from veblush/port-backport
4d2251c3e4 Add UPB_NORETURN for MSC
git-subtree-dir: third_party/upb
git-subtree-split: 60607da72e89ba0c84c84054d2e562d8b6b61177
4 years ago
|
|
|
for (int i = 0; i < file->dependency_count(); i++) {
|
|
|
|
output(" &$0,\n", DefInitSymbol(file->dependency(i)));
|
|
|
|
}
|
|
|
|
output(" NULL\n");
|
|
|
|
output("};\n");
|
|
|
|
output("\n");
|
|
|
|
|
|
|
|
output("_upb_DefPool_Init $0 = {\n", DefInitSymbol(file));
|
Squashed 'third_party/upb/' changes from 382d5afc60..60607da72e
60607da72e Merge pull request #356 from haberman/codegen-uniquefiles
7a54a5f3d6 Split the code generators for .upb and .upbdefs.
b10b02f66f Merge pull request #353 from haberman/small-fixes
cd7c2d2701 Merge pull request #352 from haberman/large-field-number
10b355a6e0 A couple minor fixes. These are exercised by Ruby.
6c30b5fe73 Fixed upb encoder for field numbers > 2**28.
31b3528424 Merge pull request #350 from haberman/encode-depthlimit
e9551022c1 Added depth limit checking to upb_encode().
f389384c5a Merge pull request #349 from lidizheng/json-public
f72c26cbc4 Make :json publically visible
5797d95172 Merge pull request #348 from haberman/json-emit-defaults
7a17493269 Removed print debugging.
695b7f4617 Added code to test UPB_JSONENC_EMITDEFAULTS.
6b357607bd Fixed bugs in JSON encoding with UPB_JSONENC_EMITDEFAULTS.
1b08391979 Merge pull request #347 from haberman/filedef-symtab
ee49a8d7df Added an accessor to get the symtab from a filedef.
a81b47025a Merge pull request #345 from haberman/encode-skipunknown
6535cbe380 Merge pull request #346 from timgates42/bugfix_typo_position
7225108720 docs: fix simple typo, posisiton -> position
871ff96252 Test SKIPUNKNOWN on regular fields.
0569c22a1e Removed debug print.
76764643ac Added option to binary encoder to skip unknown fields.
794ce6d061 Merge pull request #344 from haberman/deterministic-serialize
a04627abc8 Added map sorting to binary and text encoders.
3e071ea91a Merge pull request #343 from haberman/msvc
e70e488e09 MSVC apparently doesn't support the standard C/C++ defines.
963e501aa6 Merge pull request #342 from haberman/fuzz
8d670d8aea Renamed decode_varint32() to decode_tag().
9abf8e043f Clamp 32-bit varints to 5 bytes to fix a fuzz failure.
50a543de7f Merge pull request #341 from haberman/code-size
9c87f1168f Added size benchmark for CODE_SIZE.
6f82028236 Merge pull request #340 from haberman/darwin-setjmp
358fa14d0e Fixed headers and updated benchmark script.
bc200451ce Use a macro instead of an inline function for setjmp/longjmp.
ca279f8afa Merge branch 'master' into darwin-setjmp
fbc0639b07 Use _setjmp on mac to avoid saving/restoring the signal mask.
10f0a38450 Merge pull request #337 from haberman/size-benchmarks
4be07a2dce Increase build timeout until we can parallelize the build.
378a27b640 Force "size" to run locally.
da48e01f05 More google3 fixes.
d2446fd2db Moved cc_api_version attribute to proto_library().
4a84390c89 Added cc_proto_library() tweaks for google3.
4dd4212a34 Merge branch 'master' into size-benchmarks
ffecfef161 Merge branch 'master' into size-benchmarks
86f671d5fd Fix for Darwin (output is different, but it won't error out).
165e01ec6f Fix for old Python versions.
40fdff5e43 Merge pull request #339 from haberman/benchmark-alias
5f8bb5de1d Updated generated code.
65d166a6ba Added API for copy vs. alias and added benchmarks to test both.
27b9c999a7 Merge pull request #338 from haberman/arena-initial
9df96874e9 Start arena block doubling at initial block size.
881ddac7fe Also use .format() for gen_synthetic_protos.py.
8b7dabe1a2 Use format() instead of string interpolation, for old Python versions.
8e08282c3b Removed unused small.proto.
0f79d47215 Added missing lite binaries to size_data.txt.
555fbbc0bc Size benchmarks are working pretty well.
85cbc41a89 Merge branch 'master' into size-benchmarks
e5bdfba92c Removed accidentally-added .orig file.
07851fac58 Merge pull request #336 from haberman/fuzz
982b634bc5 Fixed a few minor bugs found by fuzzing.
c9d2e58480 Merge pull request #310 from haberman/fast-table
a01f3e23a4 Fixes for google3 build, and exclude even more tests from macOS to avoid timeout.
a83d55ee4b Exclude Clang tests from MacOS to avoid Kokoro timeouts.
73fcfe9ed0 Tried to slim down the tests a bit more.
baab25b7aa Removed excess/redundant tests from Kokoro script.
1eb7bd39e7 Some formatting fixes.
9d87055ce4 Updated Kokoro build script.
4bd34da105 WIP.
a7993615bf Merge branch 'master' into fast-table
3a3efe69a2 Added incompatible_use_toolchain_transition = True per https://github.com/bazelbuild/bazel/issues/11584
7b4e376f79 Switch unordered_set -> absl::flat_hash_set.
fe62fc83e1 Removed obsolete includes in benchmark.
5ed089dc42 Merge pull request #335 from haberman/wyhash-rule
e9b79542ad Added a BUILD file for wyhash.
7b8ae7ec4e Merge branch 'master' into size-benchmarks
a5b5445da6 Merge pull request #334 from haberman/rm-port-c
6c16cba83f Removed obsolete port.c file.
484d8f746a Updated comment in wyhash.h to correct spelling mistake.
6a9d0f45b8 Merge pull request #333 from haberman/32bitfixes
5b1f0d86a1 For Kokoro, only build/test -m32 on Linux.
0497f8deed Fixed a critical bug on 32-bit builds, and added much more Kokoro testing.
7543f851f1 Merge pull request #332 from haberman/php-amalgamation
64abb5eb11 Amalgamation no longer bundles wyhash, but #includes it.
a2a40792b5 Merge pull request #331 from haberman/json-oneof-fix
dd0994d377 Bugfix for JSON decoding: only check real oneofs for duplicates.
496f638025 Merge pull request #330 from haberman/symtab-longjmp
c9f9668234 symtab: use longjmp() for errors and avoid intermediate table.
4d9a8cd67b Merge branch 'master' into symtab-longjmp
6322d1d72d Merge pull request #329 from haberman/benchmark-ads-descriptor
5ec1d39224 Avoid building .pb.cc for ads protos, as C++ takes forever to compile.
43c207ea7e Added CMake dummy rule.
c3b5637646 Added benchmark for loading ads descriptor.
acd72c6d3f WIP.
6ae3b66cd2 Merge pull request #328 from haberman/optdefload
8113ebd6c7 Added explanatory comment about integer constants.
f2d826b9f3 Got rid of floating-point division in table init.
723cd8ffc1 Added wyhash code and LICENSE, and removed temporary benchmark.
15e20636c3 Merge branch 'master' into optdefload
154f2c25f4 Added UTF-8 validation for proto3 string fields.
e8f9eac68c Added #defines UPB_ENABLE_FASTTABLE and UPB_TRY_ENABLE_FASTTABLE.
994cf07cf3 Merge pull request #327 from benjaminp/modern-linking
b5bd5807a7 Migrate to modern Starlark linking api.
dc64613607 Merge branch 'fastest-table' into fast-table
e86541ac1d Fixed the build after the merge.
1cd0cb17d3 Merge branch 'master' into fastest-table
901744a97e Merge pull request #326 from haberman/c99
a0d16e7073 Added a few missing copts, and made some functions proper prototypes.
558315a1c3 Added COPTS to :port.
7e5bd65098 Plumbed copts (including the crucial -std=c99) to upb_proto_library() aspect.
8f3ee80d46 Drop C89/C90 support and MSVC prior to Visual Studio 2015.
a274ad786a Plumbed copts (including the crucial -std=c99) to upb_proto_library() aspect.
2c8bb6dd9d Specify C99 explicitly until/unless we stop using bool.
efd576b698 Added -std=gnu99 for fastdecode and ran Buildifier.
b928696942 A few more fixes, and test fastdecode under Kokoro.
55f3569cd2 A few minor fixes and more assertions.
8b38e8f214 Merge branch 'fastest-table' into fast-table
46eb82467a Added comment to decode_fast.h.
bd9f8f580d Fixed a few bugs with the fast decoder.
3eba47914b Allocate hasbits and table slots in "hotness" order.
021db6fcd5 Allow larger tags into the table if they are unique mod 31.
86d9908c55 Fastdecode support for packed fields.
e3e797b680 Added fasttable support for oneofs.
7ffa9c181a Fixed some small bugs and performance problems in string copying.
e2c709e047 Repeated string and primitive support.
e9103eda9e Merge branch 'master' into fastest-table
0756999ab6 Merge pull request #325 from haberman/inlined-arena
25db40bc30 Fixed upb::InlinedArena, which was compeltely broken.
d81ba58215 Optimized short string copying.
f3a2a79349 More optimization, back up to 2.56GB/s.
199c914295 Simplify push/pop when msg fits in the current buffer.
d5f5db2729 Put string-copying field parser into a separate function.
883f20d4dc Merge branch 'master' into fastest-table
1bd62e8218 Merge pull request #324 from haberman/simplemomi
f4adbe0698 Optimized varint decoding from Gerben.
48689df72e Eliminated bounds checks inside parsing a field.
a345af9883 Added a codegen parameter for whether fasttables are generated or not.
8a3470c543 WIP.
8e8dbb5258 Merge branch 'fastest-table' into fast-table
7d17a0e8c5 Merge branch 'master' into fastest-table
a7e2e8338d Fixed benchmark script.
72de7b7002 Merge branch 'fastest-table' into fast-table
cb234e652c Merge branch 'master' into fastest-table
b86cf2d789 Merge pull request #323 from haberman/build-files
4ea81ab107 Fixed pedantic warning.
6399b31f4b Removed ULL constants in json_decode.c.
c8ae197e64 Removed "U" suffixes, they are not necessary.
bc1e0b314f Fixed some strict C89 errors.
2c1664906a Removed license comments and upb_amalgamation for google3.
b7dc77415a Added licenses() to all BUILD files.
de22764b33 Updated Kokoro to test ... instead of :all.
e3f41de6c7 Split monolithic BUILD file into many build files.
fbe2bcafbc Merge pull request #4 from gerben-s/gerbens-fast-table
9e68ec033f Add repeated varints and fixed parsers
d0e4b688c6 Shorten name of kAliasString, so benchmark results don't wrap.
c0c9b5a168 Regenerated generated code.
eb8e6de8b7 Regenerated source files.
7f0d535826 Merge branch 'fastest-table' into fast-table
bf8e08074c Added a few more comments.
6e3c22e6ee Merge branch 'fastest-table' into fast-table
3238821315 Gave fast table entry a nicer name.
2a574d3d01 Added a bunch of comments for readability.
0deca8b8fb Merge branch 'master' into fast-table
bfadc99709 Merge branch 'master' into fastest-table
84e0f6127d Merge branch 'master' into fastest-table
61c51a607b Merge branch 'master' into fast-table
4f066765a9 Merge pull request #320 from haberman/string-view-benchmark
bf393bf086 Cleaned up benchmark names.
9eb8414b31 Added descriptor_sv.proto.
ee7da95367 Bzl formatting fix per buildifier.
de1b6b0718 Refactored proto2 benchmarks and added StringView benchmark.
c2901eeee1 Added missing #includes (caught by Blaze).
52721eadc7 Order LargeInitialBlock after non-initial-block test.
44a7130845 Used the correct copy of the protos in the benchmark.
3a242e7a48 Merge branch 'master' into fast-table
d01b712dbb Merge branch 'master' into fastest-table
d225dfc2ed Buildifier formatting fixes.
b0994a6501 Added missing dep from benchmark.
de80054018 Make required fields optional for benchmarking.
745661bf1f Merge branch 'master' into fastest-table
11585095b7 Merge pull request #319 from haberman/copy-descriptor
fd5a35d49d Minor comment changes.
bdd1a516e8 Fixed other tests.
27262adf93 Snapshot descriptor.proto into our own copy for benchmarking purposes.
d6b40fd5e2 Added missing dependency on reflection.
b9f1b67d07 Use quoted include.
1c8c16b9b1 Use quoted include.
4f901b6430 Passes all tests.
de84e20788 Merge branch 'master' into optdefload
d5c64476fd Merge pull request #318 from haberman/descriptor-load-benchmark
42d2f6cef9 Add MB/s measures in the benchmarks.
1ce98b86ec Added LoadDescriptor benchmark for proto2.
4890735ce2 Added benchmark for descriptor loading.
6f59f1256e Optimizations to descriptor loading.
6874d61704 Merge pull request #317 from haberman/gencode-compat
c81113e60f Added fallback code for when no enum matches.
c10b24ffb2 Simplified switch().
ded2e657a7 Added compatibility with old generated code.
5b0c5c7d4a Dispatch inline.
75edd3e59c Changed to use table pairs, seems to ever-so-slightly regress.
69d99a247e Merge pull request #3 from haberman/shifted-table
bca7edac8c Cleaned up table compression a bit.
b95f217996 A little speed boost, now hitting 2.51GB/s.
8ed6b2fe85 Stored mask in the table pointer.
a6dc88556d Tables are compressed, but perf goes down to 2.44GB/s.
91eb09b1bc Add a few comments.
7a1835d7c3 Merge branch 'master' into fast-table
8bd5c0088e Merge pull request #316 from haberman/submsg-array
a4966fd230 Added a few extra sanity checks.
99acbe0da8 Fixed bug where submsg array could have excess elements.
2a0425ecf5 Merge pull request #315 from haberman/conformance-fixes
7ccf5650c7 If we encounter "null" for a non-NullValue enum, throw an error.
0a3a94a12f Updated to a new version of protobuf and fixed a few conformance tests.
ddd5f28c4f Merge branch 'is_bazel'
10fa3a0c77 Merge pull request #314 from haberman/addunknown
504e105420 undef UPB_ASAN.
ab96d1ec41 Removed extraneous C++-style comment.
d5096f9ee8 Fixed bug in addunknown and added ASAN poisoning.
6fe84526be Mark _is_bazel to be replace in google3.
f01efe8b64 Removed another C99-ism.
1749082bbb Removed C99-ism.
147e363f56 Merge branch 'master' into fast-table
f2ddc15d76 Bugfix: initialize fastlimit and fastend.
65e49b694b Merge branch 'gerben-fast-table' into fast-table
1abf7d418d Added generated files.
3f719fa6b2 Bugfix: offsetting hasbits with 16 introduced a bug in calculating hasmasks. Removing extra <<16 shift in hasmask calculating and masking out the first 16 bits. This makes messages without hasbits work as well.
aec762e405 Merge branch 'master' into fast-table
4f77aaafd8 Merge pull request #2 from gerben-s/fast-table
4053805759 Bugfixes
d1cd80385b Merge pull request #313 from haberman/inline-arena
ad21083623 Merge pull request #313 from haberman/inline-arena
2339fc779c Updated obsolete comment.
b393849bbd Updated obsolete comment.
ebe53f8590 Fixed compile error.
b37f82b58b Fixed compile error.
71749b7caf Implemented inline array allocation, and moved type->lg2 map to reflection.
9557b97acc Implemented inline array allocation, and moved type->lg2 map to reflection.
b58d2a0ee6 Shrink overhead of message representation.
0bf063a2ca Shrink overhead of message representation.
d87ceeacab Shave off one more store.
ddc52ab9d6 Shave off one more store.
c25d895adf Shrunk the arena state that needs to be synced.
7f67f68c1c Shrunk the arena state that needs to be synced.
ff40dd6ea9 Added new internal header.
85a43e5461 Added new internal header.
36662b3735 Refactor some code. I extracted some common code from all message field parsers, to a tail recursive function. Removed the varint jmp table for a simple varint parse loop, that removes the stack frames. Also careful with not losing information in repeated message tag check. When written mindful the checks and loads that happen can be reused for tag dispatch if not the expected tag.
cbcd635917 Fixed memory leak.
bcbcdadbd2 Fixed memory leak.
e5264bd794 Merge pull request #312 from haberman/defiter
52957fa984 Merge pull request #312 from haberman/defiter
746f64692c Moved arena inline for decoder.
7363b91ac3 Moved arena inline for decoder.
b8ef1dcc57 Removed C++-style comments.
575acd85bd Re-added const for all of the pointer wrapper types.
5aa5b77b41 Added simple offset-based accessors for defs, and deprecated old iterators.
33384301e2 Merge pull request #311 from haberman/proto2-benchmark2
578e7c1f4c Merge pull request #311 from haberman/proto2-benchmark2
bc301e7da4 Use merge/partial variants to give proto2 benchmark the fairest hearing.
30f01afa83 Added LargeInitialBlock test for proto2.
5d23fd99af Used shorter protobuf:: namespace alias.
9938cf8f27 Put submsg_index directly in table data. Drop oneof support for now to focus.
d87179501d Another build fix.
89bd8b87e1 Fixed a few more C89 compat issues.
64d293894a Fixed bug introduced by last optimization.
ff957b996c Fixed C89 compat issues.
537b6f42c2 A few updates to the benchamrk and minor implementation changes.
0dcc5641eb Replicated dispatch and implemeted array resizing logic. Up to 2.67GB/s.
526e430794 I think this may have reached the optimization limit.
4c65b25daf Handle long varints, now 2GB/s!
e39ec95ca2 Hoisted updates to limits and depth out of the loop.
52a0ed3891 Fixed a bug with tag number 15.
388b6f64eb A small optimization: don't increment array length every iteration.
9e5c5ce089 Optimized memset() with cutoff and fixed group & unknown message bugs.
8dd7b5a2ca A bunch more optimization.
e46e94ec7f Added benchmarks for proto2.
405e7934b1 Handle 2-byte submessage lengths.
88b1ec7784 Table-driven supports repeated sub-messages.
f173642db4 Handle non-repeated submessages.
e219a2d91d Merge branch 'decode-arena' into fast-table
7ec2c52346 Donate/steal from arena to accelerate decoding.
d43ccfa079 Revert test changes.
fac992db83 Cleanup for showing.
3937874a85 We have a properly structured algorithm, but perf regresses by 20%.
438ecaeb5a Give all field parsers a generic table entry.
383ae5293e WIP.
26abaa2345 WIP.
34b98bc030 Avoid passing too many params to fallback.
763a3f6293 WIP.
02ff6fb996 Merge pull request #309 from haberman/decoder-forceinline
a202ce9629 Add UPB_FORCEINLINE for varint32 decoding.
d0f2c4c8a2 Merge pull request #308 from haberman/encoder
5741eb9ad7 Expanded benchmarking script and added one size opt to the encoder.
0135399e60 Fixed bug introduced in refactoring.
df3438222b Notated impossible branch as unreachable.
9b31e8fe12 Merged common encode tag paths.
5d7dc718cc Minor formatting fix.
80441e4eb4 Optimized binary encoder.
ada28896b9 Changed encoder to use longjmp() for error recovery.
6e140c267c Added benchmark for encoding.
7338facddb Merge pull request #307 from veblush/port-backport
4d2251c3e4 Add UPB_NORETURN for MSC
git-subtree-dir: third_party/upb
git-subtree-split: 60607da72e89ba0c84c84054d2e562d8b6b61177
4 years ago
|
|
|
output(" deps,\n");
|
|
|
|
output(" &$0,\n", FileLayoutName(file));
|
Squashed 'third_party/upb/' changes from 382d5afc60..60607da72e
60607da72e Merge pull request #356 from haberman/codegen-uniquefiles
7a54a5f3d6 Split the code generators for .upb and .upbdefs.
b10b02f66f Merge pull request #353 from haberman/small-fixes
cd7c2d2701 Merge pull request #352 from haberman/large-field-number
10b355a6e0 A couple minor fixes. These are exercised by Ruby.
6c30b5fe73 Fixed upb encoder for field numbers > 2**28.
31b3528424 Merge pull request #350 from haberman/encode-depthlimit
e9551022c1 Added depth limit checking to upb_encode().
f389384c5a Merge pull request #349 from lidizheng/json-public
f72c26cbc4 Make :json publically visible
5797d95172 Merge pull request #348 from haberman/json-emit-defaults
7a17493269 Removed print debugging.
695b7f4617 Added code to test UPB_JSONENC_EMITDEFAULTS.
6b357607bd Fixed bugs in JSON encoding with UPB_JSONENC_EMITDEFAULTS.
1b08391979 Merge pull request #347 from haberman/filedef-symtab
ee49a8d7df Added an accessor to get the symtab from a filedef.
a81b47025a Merge pull request #345 from haberman/encode-skipunknown
6535cbe380 Merge pull request #346 from timgates42/bugfix_typo_position
7225108720 docs: fix simple typo, posisiton -> position
871ff96252 Test SKIPUNKNOWN on regular fields.
0569c22a1e Removed debug print.
76764643ac Added option to binary encoder to skip unknown fields.
794ce6d061 Merge pull request #344 from haberman/deterministic-serialize
a04627abc8 Added map sorting to binary and text encoders.
3e071ea91a Merge pull request #343 from haberman/msvc
e70e488e09 MSVC apparently doesn't support the standard C/C++ defines.
963e501aa6 Merge pull request #342 from haberman/fuzz
8d670d8aea Renamed decode_varint32() to decode_tag().
9abf8e043f Clamp 32-bit varints to 5 bytes to fix a fuzz failure.
50a543de7f Merge pull request #341 from haberman/code-size
9c87f1168f Added size benchmark for CODE_SIZE.
6f82028236 Merge pull request #340 from haberman/darwin-setjmp
358fa14d0e Fixed headers and updated benchmark script.
bc200451ce Use a macro instead of an inline function for setjmp/longjmp.
ca279f8afa Merge branch 'master' into darwin-setjmp
fbc0639b07 Use _setjmp on mac to avoid saving/restoring the signal mask.
10f0a38450 Merge pull request #337 from haberman/size-benchmarks
4be07a2dce Increase build timeout until we can parallelize the build.
378a27b640 Force "size" to run locally.
da48e01f05 More google3 fixes.
d2446fd2db Moved cc_api_version attribute to proto_library().
4a84390c89 Added cc_proto_library() tweaks for google3.
4dd4212a34 Merge branch 'master' into size-benchmarks
ffecfef161 Merge branch 'master' into size-benchmarks
86f671d5fd Fix for Darwin (output is different, but it won't error out).
165e01ec6f Fix for old Python versions.
40fdff5e43 Merge pull request #339 from haberman/benchmark-alias
5f8bb5de1d Updated generated code.
65d166a6ba Added API for copy vs. alias and added benchmarks to test both.
27b9c999a7 Merge pull request #338 from haberman/arena-initial
9df96874e9 Start arena block doubling at initial block size.
881ddac7fe Also use .format() for gen_synthetic_protos.py.
8b7dabe1a2 Use format() instead of string interpolation, for old Python versions.
8e08282c3b Removed unused small.proto.
0f79d47215 Added missing lite binaries to size_data.txt.
555fbbc0bc Size benchmarks are working pretty well.
85cbc41a89 Merge branch 'master' into size-benchmarks
e5bdfba92c Removed accidentally-added .orig file.
07851fac58 Merge pull request #336 from haberman/fuzz
982b634bc5 Fixed a few minor bugs found by fuzzing.
c9d2e58480 Merge pull request #310 from haberman/fast-table
a01f3e23a4 Fixes for google3 build, and exclude even more tests from macOS to avoid timeout.
a83d55ee4b Exclude Clang tests from MacOS to avoid Kokoro timeouts.
73fcfe9ed0 Tried to slim down the tests a bit more.
baab25b7aa Removed excess/redundant tests from Kokoro script.
1eb7bd39e7 Some formatting fixes.
9d87055ce4 Updated Kokoro build script.
4bd34da105 WIP.
a7993615bf Merge branch 'master' into fast-table
3a3efe69a2 Added incompatible_use_toolchain_transition = True per https://github.com/bazelbuild/bazel/issues/11584
7b4e376f79 Switch unordered_set -> absl::flat_hash_set.
fe62fc83e1 Removed obsolete includes in benchmark.
5ed089dc42 Merge pull request #335 from haberman/wyhash-rule
e9b79542ad Added a BUILD file for wyhash.
7b8ae7ec4e Merge branch 'master' into size-benchmarks
a5b5445da6 Merge pull request #334 from haberman/rm-port-c
6c16cba83f Removed obsolete port.c file.
484d8f746a Updated comment in wyhash.h to correct spelling mistake.
6a9d0f45b8 Merge pull request #333 from haberman/32bitfixes
5b1f0d86a1 For Kokoro, only build/test -m32 on Linux.
0497f8deed Fixed a critical bug on 32-bit builds, and added much more Kokoro testing.
7543f851f1 Merge pull request #332 from haberman/php-amalgamation
64abb5eb11 Amalgamation no longer bundles wyhash, but #includes it.
a2a40792b5 Merge pull request #331 from haberman/json-oneof-fix
dd0994d377 Bugfix for JSON decoding: only check real oneofs for duplicates.
496f638025 Merge pull request #330 from haberman/symtab-longjmp
c9f9668234 symtab: use longjmp() for errors and avoid intermediate table.
4d9a8cd67b Merge branch 'master' into symtab-longjmp
6322d1d72d Merge pull request #329 from haberman/benchmark-ads-descriptor
5ec1d39224 Avoid building .pb.cc for ads protos, as C++ takes forever to compile.
43c207ea7e Added CMake dummy rule.
c3b5637646 Added benchmark for loading ads descriptor.
acd72c6d3f WIP.
6ae3b66cd2 Merge pull request #328 from haberman/optdefload
8113ebd6c7 Added explanatory comment about integer constants.
f2d826b9f3 Got rid of floating-point division in table init.
723cd8ffc1 Added wyhash code and LICENSE, and removed temporary benchmark.
15e20636c3 Merge branch 'master' into optdefload
154f2c25f4 Added UTF-8 validation for proto3 string fields.
e8f9eac68c Added #defines UPB_ENABLE_FASTTABLE and UPB_TRY_ENABLE_FASTTABLE.
994cf07cf3 Merge pull request #327 from benjaminp/modern-linking
b5bd5807a7 Migrate to modern Starlark linking api.
dc64613607 Merge branch 'fastest-table' into fast-table
e86541ac1d Fixed the build after the merge.
1cd0cb17d3 Merge branch 'master' into fastest-table
901744a97e Merge pull request #326 from haberman/c99
a0d16e7073 Added a few missing copts, and made some functions proper prototypes.
558315a1c3 Added COPTS to :port.
7e5bd65098 Plumbed copts (including the crucial -std=c99) to upb_proto_library() aspect.
8f3ee80d46 Drop C89/C90 support and MSVC prior to Visual Studio 2015.
a274ad786a Plumbed copts (including the crucial -std=c99) to upb_proto_library() aspect.
2c8bb6dd9d Specify C99 explicitly until/unless we stop using bool.
efd576b698 Added -std=gnu99 for fastdecode and ran Buildifier.
b928696942 A few more fixes, and test fastdecode under Kokoro.
55f3569cd2 A few minor fixes and more assertions.
8b38e8f214 Merge branch 'fastest-table' into fast-table
46eb82467a Added comment to decode_fast.h.
bd9f8f580d Fixed a few bugs with the fast decoder.
3eba47914b Allocate hasbits and table slots in "hotness" order.
021db6fcd5 Allow larger tags into the table if they are unique mod 31.
86d9908c55 Fastdecode support for packed fields.
e3e797b680 Added fasttable support for oneofs.
7ffa9c181a Fixed some small bugs and performance problems in string copying.
e2c709e047 Repeated string and primitive support.
e9103eda9e Merge branch 'master' into fastest-table
0756999ab6 Merge pull request #325 from haberman/inlined-arena
25db40bc30 Fixed upb::InlinedArena, which was compeltely broken.
d81ba58215 Optimized short string copying.
f3a2a79349 More optimization, back up to 2.56GB/s.
199c914295 Simplify push/pop when msg fits in the current buffer.
d5f5db2729 Put string-copying field parser into a separate function.
883f20d4dc Merge branch 'master' into fastest-table
1bd62e8218 Merge pull request #324 from haberman/simplemomi
f4adbe0698 Optimized varint decoding from Gerben.
48689df72e Eliminated bounds checks inside parsing a field.
a345af9883 Added a codegen parameter for whether fasttables are generated or not.
8a3470c543 WIP.
8e8dbb5258 Merge branch 'fastest-table' into fast-table
7d17a0e8c5 Merge branch 'master' into fastest-table
a7e2e8338d Fixed benchmark script.
72de7b7002 Merge branch 'fastest-table' into fast-table
cb234e652c Merge branch 'master' into fastest-table
b86cf2d789 Merge pull request #323 from haberman/build-files
4ea81ab107 Fixed pedantic warning.
6399b31f4b Removed ULL constants in json_decode.c.
c8ae197e64 Removed "U" suffixes, they are not necessary.
bc1e0b314f Fixed some strict C89 errors.
2c1664906a Removed license comments and upb_amalgamation for google3.
b7dc77415a Added licenses() to all BUILD files.
de22764b33 Updated Kokoro to test ... instead of :all.
e3f41de6c7 Split monolithic BUILD file into many build files.
fbe2bcafbc Merge pull request #4 from gerben-s/gerbens-fast-table
9e68ec033f Add repeated varints and fixed parsers
d0e4b688c6 Shorten name of kAliasString, so benchmark results don't wrap.
c0c9b5a168 Regenerated generated code.
eb8e6de8b7 Regenerated source files.
7f0d535826 Merge branch 'fastest-table' into fast-table
bf8e08074c Added a few more comments.
6e3c22e6ee Merge branch 'fastest-table' into fast-table
3238821315 Gave fast table entry a nicer name.
2a574d3d01 Added a bunch of comments for readability.
0deca8b8fb Merge branch 'master' into fast-table
bfadc99709 Merge branch 'master' into fastest-table
84e0f6127d Merge branch 'master' into fastest-table
61c51a607b Merge branch 'master' into fast-table
4f066765a9 Merge pull request #320 from haberman/string-view-benchmark
bf393bf086 Cleaned up benchmark names.
9eb8414b31 Added descriptor_sv.proto.
ee7da95367 Bzl formatting fix per buildifier.
de1b6b0718 Refactored proto2 benchmarks and added StringView benchmark.
c2901eeee1 Added missing #includes (caught by Blaze).
52721eadc7 Order LargeInitialBlock after non-initial-block test.
44a7130845 Used the correct copy of the protos in the benchmark.
3a242e7a48 Merge branch 'master' into fast-table
d01b712dbb Merge branch 'master' into fastest-table
d225dfc2ed Buildifier formatting fixes.
b0994a6501 Added missing dep from benchmark.
de80054018 Make required fields optional for benchmarking.
745661bf1f Merge branch 'master' into fastest-table
11585095b7 Merge pull request #319 from haberman/copy-descriptor
fd5a35d49d Minor comment changes.
bdd1a516e8 Fixed other tests.
27262adf93 Snapshot descriptor.proto into our own copy for benchmarking purposes.
d6b40fd5e2 Added missing dependency on reflection.
b9f1b67d07 Use quoted include.
1c8c16b9b1 Use quoted include.
4f901b6430 Passes all tests.
de84e20788 Merge branch 'master' into optdefload
d5c64476fd Merge pull request #318 from haberman/descriptor-load-benchmark
42d2f6cef9 Add MB/s measures in the benchmarks.
1ce98b86ec Added LoadDescriptor benchmark for proto2.
4890735ce2 Added benchmark for descriptor loading.
6f59f1256e Optimizations to descriptor loading.
6874d61704 Merge pull request #317 from haberman/gencode-compat
c81113e60f Added fallback code for when no enum matches.
c10b24ffb2 Simplified switch().
ded2e657a7 Added compatibility with old generated code.
5b0c5c7d4a Dispatch inline.
75edd3e59c Changed to use table pairs, seems to ever-so-slightly regress.
69d99a247e Merge pull request #3 from haberman/shifted-table
bca7edac8c Cleaned up table compression a bit.
b95f217996 A little speed boost, now hitting 2.51GB/s.
8ed6b2fe85 Stored mask in the table pointer.
a6dc88556d Tables are compressed, but perf goes down to 2.44GB/s.
91eb09b1bc Add a few comments.
7a1835d7c3 Merge branch 'master' into fast-table
8bd5c0088e Merge pull request #316 from haberman/submsg-array
a4966fd230 Added a few extra sanity checks.
99acbe0da8 Fixed bug where submsg array could have excess elements.
2a0425ecf5 Merge pull request #315 from haberman/conformance-fixes
7ccf5650c7 If we encounter "null" for a non-NullValue enum, throw an error.
0a3a94a12f Updated to a new version of protobuf and fixed a few conformance tests.
ddd5f28c4f Merge branch 'is_bazel'
10fa3a0c77 Merge pull request #314 from haberman/addunknown
504e105420 undef UPB_ASAN.
ab96d1ec41 Removed extraneous C++-style comment.
d5096f9ee8 Fixed bug in addunknown and added ASAN poisoning.
6fe84526be Mark _is_bazel to be replace in google3.
f01efe8b64 Removed another C99-ism.
1749082bbb Removed C99-ism.
147e363f56 Merge branch 'master' into fast-table
f2ddc15d76 Bugfix: initialize fastlimit and fastend.
65e49b694b Merge branch 'gerben-fast-table' into fast-table
1abf7d418d Added generated files.
3f719fa6b2 Bugfix: offsetting hasbits with 16 introduced a bug in calculating hasmasks. Removing extra <<16 shift in hasmask calculating and masking out the first 16 bits. This makes messages without hasbits work as well.
aec762e405 Merge branch 'master' into fast-table
4f77aaafd8 Merge pull request #2 from gerben-s/fast-table
4053805759 Bugfixes
d1cd80385b Merge pull request #313 from haberman/inline-arena
ad21083623 Merge pull request #313 from haberman/inline-arena
2339fc779c Updated obsolete comment.
b393849bbd Updated obsolete comment.
ebe53f8590 Fixed compile error.
b37f82b58b Fixed compile error.
71749b7caf Implemented inline array allocation, and moved type->lg2 map to reflection.
9557b97acc Implemented inline array allocation, and moved type->lg2 map to reflection.
b58d2a0ee6 Shrink overhead of message representation.
0bf063a2ca Shrink overhead of message representation.
d87ceeacab Shave off one more store.
ddc52ab9d6 Shave off one more store.
c25d895adf Shrunk the arena state that needs to be synced.
7f67f68c1c Shrunk the arena state that needs to be synced.
ff40dd6ea9 Added new internal header.
85a43e5461 Added new internal header.
36662b3735 Refactor some code. I extracted some common code from all message field parsers, to a tail recursive function. Removed the varint jmp table for a simple varint parse loop, that removes the stack frames. Also careful with not losing information in repeated message tag check. When written mindful the checks and loads that happen can be reused for tag dispatch if not the expected tag.
cbcd635917 Fixed memory leak.
bcbcdadbd2 Fixed memory leak.
e5264bd794 Merge pull request #312 from haberman/defiter
52957fa984 Merge pull request #312 from haberman/defiter
746f64692c Moved arena inline for decoder.
7363b91ac3 Moved arena inline for decoder.
b8ef1dcc57 Removed C++-style comments.
575acd85bd Re-added const for all of the pointer wrapper types.
5aa5b77b41 Added simple offset-based accessors for defs, and deprecated old iterators.
33384301e2 Merge pull request #311 from haberman/proto2-benchmark2
578e7c1f4c Merge pull request #311 from haberman/proto2-benchmark2
bc301e7da4 Use merge/partial variants to give proto2 benchmark the fairest hearing.
30f01afa83 Added LargeInitialBlock test for proto2.
5d23fd99af Used shorter protobuf:: namespace alias.
9938cf8f27 Put submsg_index directly in table data. Drop oneof support for now to focus.
d87179501d Another build fix.
89bd8b87e1 Fixed a few more C89 compat issues.
64d293894a Fixed bug introduced by last optimization.
ff957b996c Fixed C89 compat issues.
537b6f42c2 A few updates to the benchamrk and minor implementation changes.
0dcc5641eb Replicated dispatch and implemeted array resizing logic. Up to 2.67GB/s.
526e430794 I think this may have reached the optimization limit.
4c65b25daf Handle long varints, now 2GB/s!
e39ec95ca2 Hoisted updates to limits and depth out of the loop.
52a0ed3891 Fixed a bug with tag number 15.
388b6f64eb A small optimization: don't increment array length every iteration.
9e5c5ce089 Optimized memset() with cutoff and fixed group & unknown message bugs.
8dd7b5a2ca A bunch more optimization.
e46e94ec7f Added benchmarks for proto2.
405e7934b1 Handle 2-byte submessage lengths.
88b1ec7784 Table-driven supports repeated sub-messages.
f173642db4 Handle non-repeated submessages.
e219a2d91d Merge branch 'decode-arena' into fast-table
7ec2c52346 Donate/steal from arena to accelerate decoding.
d43ccfa079 Revert test changes.
fac992db83 Cleanup for showing.
3937874a85 We have a properly structured algorithm, but perf regresses by 20%.
438ecaeb5a Give all field parsers a generic table entry.
383ae5293e WIP.
26abaa2345 WIP.
34b98bc030 Avoid passing too many params to fallback.
763a3f6293 WIP.
02ff6fb996 Merge pull request #309 from haberman/decoder-forceinline
a202ce9629 Add UPB_FORCEINLINE for varint32 decoding.
d0f2c4c8a2 Merge pull request #308 from haberman/encoder
5741eb9ad7 Expanded benchmarking script and added one size opt to the encoder.
0135399e60 Fixed bug introduced in refactoring.
df3438222b Notated impossible branch as unreachable.
9b31e8fe12 Merged common encode tag paths.
5d7dc718cc Minor formatting fix.
80441e4eb4 Optimized binary encoder.
ada28896b9 Changed encoder to use longjmp() for error recovery.
6e140c267c Added benchmark for encoding.
7338facddb Merge pull request #307 from veblush/port-backport
4d2251c3e4 Add UPB_NORETURN for MSC
git-subtree-dir: third_party/upb
git-subtree-split: 60607da72e89ba0c84c84054d2e562d8b6b61177
4 years ago
|
|
|
output(" \"$0\",\n", file->name());
|
|
|
|
output(" UPB_STRINGVIEW_INIT(descriptor, $0)\n", file_data.size());
|
Squashed 'third_party/upb/' changes from 382d5afc60..60607da72e
60607da72e Merge pull request #356 from haberman/codegen-uniquefiles
7a54a5f3d6 Split the code generators for .upb and .upbdefs.
b10b02f66f Merge pull request #353 from haberman/small-fixes
cd7c2d2701 Merge pull request #352 from haberman/large-field-number
10b355a6e0 A couple minor fixes. These are exercised by Ruby.
6c30b5fe73 Fixed upb encoder for field numbers > 2**28.
31b3528424 Merge pull request #350 from haberman/encode-depthlimit
e9551022c1 Added depth limit checking to upb_encode().
f389384c5a Merge pull request #349 from lidizheng/json-public
f72c26cbc4 Make :json publically visible
5797d95172 Merge pull request #348 from haberman/json-emit-defaults
7a17493269 Removed print debugging.
695b7f4617 Added code to test UPB_JSONENC_EMITDEFAULTS.
6b357607bd Fixed bugs in JSON encoding with UPB_JSONENC_EMITDEFAULTS.
1b08391979 Merge pull request #347 from haberman/filedef-symtab
ee49a8d7df Added an accessor to get the symtab from a filedef.
a81b47025a Merge pull request #345 from haberman/encode-skipunknown
6535cbe380 Merge pull request #346 from timgates42/bugfix_typo_position
7225108720 docs: fix simple typo, posisiton -> position
871ff96252 Test SKIPUNKNOWN on regular fields.
0569c22a1e Removed debug print.
76764643ac Added option to binary encoder to skip unknown fields.
794ce6d061 Merge pull request #344 from haberman/deterministic-serialize
a04627abc8 Added map sorting to binary and text encoders.
3e071ea91a Merge pull request #343 from haberman/msvc
e70e488e09 MSVC apparently doesn't support the standard C/C++ defines.
963e501aa6 Merge pull request #342 from haberman/fuzz
8d670d8aea Renamed decode_varint32() to decode_tag().
9abf8e043f Clamp 32-bit varints to 5 bytes to fix a fuzz failure.
50a543de7f Merge pull request #341 from haberman/code-size
9c87f1168f Added size benchmark for CODE_SIZE.
6f82028236 Merge pull request #340 from haberman/darwin-setjmp
358fa14d0e Fixed headers and updated benchmark script.
bc200451ce Use a macro instead of an inline function for setjmp/longjmp.
ca279f8afa Merge branch 'master' into darwin-setjmp
fbc0639b07 Use _setjmp on mac to avoid saving/restoring the signal mask.
10f0a38450 Merge pull request #337 from haberman/size-benchmarks
4be07a2dce Increase build timeout until we can parallelize the build.
378a27b640 Force "size" to run locally.
da48e01f05 More google3 fixes.
d2446fd2db Moved cc_api_version attribute to proto_library().
4a84390c89 Added cc_proto_library() tweaks for google3.
4dd4212a34 Merge branch 'master' into size-benchmarks
ffecfef161 Merge branch 'master' into size-benchmarks
86f671d5fd Fix for Darwin (output is different, but it won't error out).
165e01ec6f Fix for old Python versions.
40fdff5e43 Merge pull request #339 from haberman/benchmark-alias
5f8bb5de1d Updated generated code.
65d166a6ba Added API for copy vs. alias and added benchmarks to test both.
27b9c999a7 Merge pull request #338 from haberman/arena-initial
9df96874e9 Start arena block doubling at initial block size.
881ddac7fe Also use .format() for gen_synthetic_protos.py.
8b7dabe1a2 Use format() instead of string interpolation, for old Python versions.
8e08282c3b Removed unused small.proto.
0f79d47215 Added missing lite binaries to size_data.txt.
555fbbc0bc Size benchmarks are working pretty well.
85cbc41a89 Merge branch 'master' into size-benchmarks
e5bdfba92c Removed accidentally-added .orig file.
07851fac58 Merge pull request #336 from haberman/fuzz
982b634bc5 Fixed a few minor bugs found by fuzzing.
c9d2e58480 Merge pull request #310 from haberman/fast-table
a01f3e23a4 Fixes for google3 build, and exclude even more tests from macOS to avoid timeout.
a83d55ee4b Exclude Clang tests from MacOS to avoid Kokoro timeouts.
73fcfe9ed0 Tried to slim down the tests a bit more.
baab25b7aa Removed excess/redundant tests from Kokoro script.
1eb7bd39e7 Some formatting fixes.
9d87055ce4 Updated Kokoro build script.
4bd34da105 WIP.
a7993615bf Merge branch 'master' into fast-table
3a3efe69a2 Added incompatible_use_toolchain_transition = True per https://github.com/bazelbuild/bazel/issues/11584
7b4e376f79 Switch unordered_set -> absl::flat_hash_set.
fe62fc83e1 Removed obsolete includes in benchmark.
5ed089dc42 Merge pull request #335 from haberman/wyhash-rule
e9b79542ad Added a BUILD file for wyhash.
7b8ae7ec4e Merge branch 'master' into size-benchmarks
a5b5445da6 Merge pull request #334 from haberman/rm-port-c
6c16cba83f Removed obsolete port.c file.
484d8f746a Updated comment in wyhash.h to correct spelling mistake.
6a9d0f45b8 Merge pull request #333 from haberman/32bitfixes
5b1f0d86a1 For Kokoro, only build/test -m32 on Linux.
0497f8deed Fixed a critical bug on 32-bit builds, and added much more Kokoro testing.
7543f851f1 Merge pull request #332 from haberman/php-amalgamation
64abb5eb11 Amalgamation no longer bundles wyhash, but #includes it.
a2a40792b5 Merge pull request #331 from haberman/json-oneof-fix
dd0994d377 Bugfix for JSON decoding: only check real oneofs for duplicates.
496f638025 Merge pull request #330 from haberman/symtab-longjmp
c9f9668234 symtab: use longjmp() for errors and avoid intermediate table.
4d9a8cd67b Merge branch 'master' into symtab-longjmp
6322d1d72d Merge pull request #329 from haberman/benchmark-ads-descriptor
5ec1d39224 Avoid building .pb.cc for ads protos, as C++ takes forever to compile.
43c207ea7e Added CMake dummy rule.
c3b5637646 Added benchmark for loading ads descriptor.
acd72c6d3f WIP.
6ae3b66cd2 Merge pull request #328 from haberman/optdefload
8113ebd6c7 Added explanatory comment about integer constants.
f2d826b9f3 Got rid of floating-point division in table init.
723cd8ffc1 Added wyhash code and LICENSE, and removed temporary benchmark.
15e20636c3 Merge branch 'master' into optdefload
154f2c25f4 Added UTF-8 validation for proto3 string fields.
e8f9eac68c Added #defines UPB_ENABLE_FASTTABLE and UPB_TRY_ENABLE_FASTTABLE.
994cf07cf3 Merge pull request #327 from benjaminp/modern-linking
b5bd5807a7 Migrate to modern Starlark linking api.
dc64613607 Merge branch 'fastest-table' into fast-table
e86541ac1d Fixed the build after the merge.
1cd0cb17d3 Merge branch 'master' into fastest-table
901744a97e Merge pull request #326 from haberman/c99
a0d16e7073 Added a few missing copts, and made some functions proper prototypes.
558315a1c3 Added COPTS to :port.
7e5bd65098 Plumbed copts (including the crucial -std=c99) to upb_proto_library() aspect.
8f3ee80d46 Drop C89/C90 support and MSVC prior to Visual Studio 2015.
a274ad786a Plumbed copts (including the crucial -std=c99) to upb_proto_library() aspect.
2c8bb6dd9d Specify C99 explicitly until/unless we stop using bool.
efd576b698 Added -std=gnu99 for fastdecode and ran Buildifier.
b928696942 A few more fixes, and test fastdecode under Kokoro.
55f3569cd2 A few minor fixes and more assertions.
8b38e8f214 Merge branch 'fastest-table' into fast-table
46eb82467a Added comment to decode_fast.h.
bd9f8f580d Fixed a few bugs with the fast decoder.
3eba47914b Allocate hasbits and table slots in "hotness" order.
021db6fcd5 Allow larger tags into the table if they are unique mod 31.
86d9908c55 Fastdecode support for packed fields.
e3e797b680 Added fasttable support for oneofs.
7ffa9c181a Fixed some small bugs and performance problems in string copying.
e2c709e047 Repeated string and primitive support.
e9103eda9e Merge branch 'master' into fastest-table
0756999ab6 Merge pull request #325 from haberman/inlined-arena
25db40bc30 Fixed upb::InlinedArena, which was compeltely broken.
d81ba58215 Optimized short string copying.
f3a2a79349 More optimization, back up to 2.56GB/s.
199c914295 Simplify push/pop when msg fits in the current buffer.
d5f5db2729 Put string-copying field parser into a separate function.
883f20d4dc Merge branch 'master' into fastest-table
1bd62e8218 Merge pull request #324 from haberman/simplemomi
f4adbe0698 Optimized varint decoding from Gerben.
48689df72e Eliminated bounds checks inside parsing a field.
a345af9883 Added a codegen parameter for whether fasttables are generated or not.
8a3470c543 WIP.
8e8dbb5258 Merge branch 'fastest-table' into fast-table
7d17a0e8c5 Merge branch 'master' into fastest-table
a7e2e8338d Fixed benchmark script.
72de7b7002 Merge branch 'fastest-table' into fast-table
cb234e652c Merge branch 'master' into fastest-table
b86cf2d789 Merge pull request #323 from haberman/build-files
4ea81ab107 Fixed pedantic warning.
6399b31f4b Removed ULL constants in json_decode.c.
c8ae197e64 Removed "U" suffixes, they are not necessary.
bc1e0b314f Fixed some strict C89 errors.
2c1664906a Removed license comments and upb_amalgamation for google3.
b7dc77415a Added licenses() to all BUILD files.
de22764b33 Updated Kokoro to test ... instead of :all.
e3f41de6c7 Split monolithic BUILD file into many build files.
fbe2bcafbc Merge pull request #4 from gerben-s/gerbens-fast-table
9e68ec033f Add repeated varints and fixed parsers
d0e4b688c6 Shorten name of kAliasString, so benchmark results don't wrap.
c0c9b5a168 Regenerated generated code.
eb8e6de8b7 Regenerated source files.
7f0d535826 Merge branch 'fastest-table' into fast-table
bf8e08074c Added a few more comments.
6e3c22e6ee Merge branch 'fastest-table' into fast-table
3238821315 Gave fast table entry a nicer name.
2a574d3d01 Added a bunch of comments for readability.
0deca8b8fb Merge branch 'master' into fast-table
bfadc99709 Merge branch 'master' into fastest-table
84e0f6127d Merge branch 'master' into fastest-table
61c51a607b Merge branch 'master' into fast-table
4f066765a9 Merge pull request #320 from haberman/string-view-benchmark
bf393bf086 Cleaned up benchmark names.
9eb8414b31 Added descriptor_sv.proto.
ee7da95367 Bzl formatting fix per buildifier.
de1b6b0718 Refactored proto2 benchmarks and added StringView benchmark.
c2901eeee1 Added missing #includes (caught by Blaze).
52721eadc7 Order LargeInitialBlock after non-initial-block test.
44a7130845 Used the correct copy of the protos in the benchmark.
3a242e7a48 Merge branch 'master' into fast-table
d01b712dbb Merge branch 'master' into fastest-table
d225dfc2ed Buildifier formatting fixes.
b0994a6501 Added missing dep from benchmark.
de80054018 Make required fields optional for benchmarking.
745661bf1f Merge branch 'master' into fastest-table
11585095b7 Merge pull request #319 from haberman/copy-descriptor
fd5a35d49d Minor comment changes.
bdd1a516e8 Fixed other tests.
27262adf93 Snapshot descriptor.proto into our own copy for benchmarking purposes.
d6b40fd5e2 Added missing dependency on reflection.
b9f1b67d07 Use quoted include.
1c8c16b9b1 Use quoted include.
4f901b6430 Passes all tests.
de84e20788 Merge branch 'master' into optdefload
d5c64476fd Merge pull request #318 from haberman/descriptor-load-benchmark
42d2f6cef9 Add MB/s measures in the benchmarks.
1ce98b86ec Added LoadDescriptor benchmark for proto2.
4890735ce2 Added benchmark for descriptor loading.
6f59f1256e Optimizations to descriptor loading.
6874d61704 Merge pull request #317 from haberman/gencode-compat
c81113e60f Added fallback code for when no enum matches.
c10b24ffb2 Simplified switch().
ded2e657a7 Added compatibility with old generated code.
5b0c5c7d4a Dispatch inline.
75edd3e59c Changed to use table pairs, seems to ever-so-slightly regress.
69d99a247e Merge pull request #3 from haberman/shifted-table
bca7edac8c Cleaned up table compression a bit.
b95f217996 A little speed boost, now hitting 2.51GB/s.
8ed6b2fe85 Stored mask in the table pointer.
a6dc88556d Tables are compressed, but perf goes down to 2.44GB/s.
91eb09b1bc Add a few comments.
7a1835d7c3 Merge branch 'master' into fast-table
8bd5c0088e Merge pull request #316 from haberman/submsg-array
a4966fd230 Added a few extra sanity checks.
99acbe0da8 Fixed bug where submsg array could have excess elements.
2a0425ecf5 Merge pull request #315 from haberman/conformance-fixes
7ccf5650c7 If we encounter "null" for a non-NullValue enum, throw an error.
0a3a94a12f Updated to a new version of protobuf and fixed a few conformance tests.
ddd5f28c4f Merge branch 'is_bazel'
10fa3a0c77 Merge pull request #314 from haberman/addunknown
504e105420 undef UPB_ASAN.
ab96d1ec41 Removed extraneous C++-style comment.
d5096f9ee8 Fixed bug in addunknown and added ASAN poisoning.
6fe84526be Mark _is_bazel to be replace in google3.
f01efe8b64 Removed another C99-ism.
1749082bbb Removed C99-ism.
147e363f56 Merge branch 'master' into fast-table
f2ddc15d76 Bugfix: initialize fastlimit and fastend.
65e49b694b Merge branch 'gerben-fast-table' into fast-table
1abf7d418d Added generated files.
3f719fa6b2 Bugfix: offsetting hasbits with 16 introduced a bug in calculating hasmasks. Removing extra <<16 shift in hasmask calculating and masking out the first 16 bits. This makes messages without hasbits work as well.
aec762e405 Merge branch 'master' into fast-table
4f77aaafd8 Merge pull request #2 from gerben-s/fast-table
4053805759 Bugfixes
d1cd80385b Merge pull request #313 from haberman/inline-arena
ad21083623 Merge pull request #313 from haberman/inline-arena
2339fc779c Updated obsolete comment.
b393849bbd Updated obsolete comment.
ebe53f8590 Fixed compile error.
b37f82b58b Fixed compile error.
71749b7caf Implemented inline array allocation, and moved type->lg2 map to reflection.
9557b97acc Implemented inline array allocation, and moved type->lg2 map to reflection.
b58d2a0ee6 Shrink overhead of message representation.
0bf063a2ca Shrink overhead of message representation.
d87ceeacab Shave off one more store.
ddc52ab9d6 Shave off one more store.
c25d895adf Shrunk the arena state that needs to be synced.
7f67f68c1c Shrunk the arena state that needs to be synced.
ff40dd6ea9 Added new internal header.
85a43e5461 Added new internal header.
36662b3735 Refactor some code. I extracted some common code from all message field parsers, to a tail recursive function. Removed the varint jmp table for a simple varint parse loop, that removes the stack frames. Also careful with not losing information in repeated message tag check. When written mindful the checks and loads that happen can be reused for tag dispatch if not the expected tag.
cbcd635917 Fixed memory leak.
bcbcdadbd2 Fixed memory leak.
e5264bd794 Merge pull request #312 from haberman/defiter
52957fa984 Merge pull request #312 from haberman/defiter
746f64692c Moved arena inline for decoder.
7363b91ac3 Moved arena inline for decoder.
b8ef1dcc57 Removed C++-style comments.
575acd85bd Re-added const for all of the pointer wrapper types.
5aa5b77b41 Added simple offset-based accessors for defs, and deprecated old iterators.
33384301e2 Merge pull request #311 from haberman/proto2-benchmark2
578e7c1f4c Merge pull request #311 from haberman/proto2-benchmark2
bc301e7da4 Use merge/partial variants to give proto2 benchmark the fairest hearing.
30f01afa83 Added LargeInitialBlock test for proto2.
5d23fd99af Used shorter protobuf:: namespace alias.
9938cf8f27 Put submsg_index directly in table data. Drop oneof support for now to focus.
d87179501d Another build fix.
89bd8b87e1 Fixed a few more C89 compat issues.
64d293894a Fixed bug introduced by last optimization.
ff957b996c Fixed C89 compat issues.
537b6f42c2 A few updates to the benchamrk and minor implementation changes.
0dcc5641eb Replicated dispatch and implemeted array resizing logic. Up to 2.67GB/s.
526e430794 I think this may have reached the optimization limit.
4c65b25daf Handle long varints, now 2GB/s!
e39ec95ca2 Hoisted updates to limits and depth out of the loop.
52a0ed3891 Fixed a bug with tag number 15.
388b6f64eb A small optimization: don't increment array length every iteration.
9e5c5ce089 Optimized memset() with cutoff and fixed group & unknown message bugs.
8dd7b5a2ca A bunch more optimization.
e46e94ec7f Added benchmarks for proto2.
405e7934b1 Handle 2-byte submessage lengths.
88b1ec7784 Table-driven supports repeated sub-messages.
f173642db4 Handle non-repeated submessages.
e219a2d91d Merge branch 'decode-arena' into fast-table
7ec2c52346 Donate/steal from arena to accelerate decoding.
d43ccfa079 Revert test changes.
fac992db83 Cleanup for showing.
3937874a85 We have a properly structured algorithm, but perf regresses by 20%.
438ecaeb5a Give all field parsers a generic table entry.
383ae5293e WIP.
26abaa2345 WIP.
34b98bc030 Avoid passing too many params to fallback.
763a3f6293 WIP.
02ff6fb996 Merge pull request #309 from haberman/decoder-forceinline
a202ce9629 Add UPB_FORCEINLINE for varint32 decoding.
d0f2c4c8a2 Merge pull request #308 from haberman/encoder
5741eb9ad7 Expanded benchmarking script and added one size opt to the encoder.
0135399e60 Fixed bug introduced in refactoring.
df3438222b Notated impossible branch as unreachable.
9b31e8fe12 Merged common encode tag paths.
5d7dc718cc Minor formatting fix.
80441e4eb4 Optimized binary encoder.
ada28896b9 Changed encoder to use longjmp() for error recovery.
6e140c267c Added benchmark for encoding.
7338facddb Merge pull request #307 from veblush/port-backport
4d2251c3e4 Add UPB_NORETURN for MSC
git-subtree-dir: third_party/upb
git-subtree-split: 60607da72e89ba0c84c84054d2e562d8b6b61177
4 years ago
|
|
|
output("};\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
class Generator : public protoc::CodeGenerator {
|
|
|
|
~Generator() override {}
|
|
|
|
bool Generate(const protobuf::FileDescriptor* file,
|
|
|
|
const std::string& parameter, protoc::GeneratorContext* context,
|
|
|
|
std::string* error) const override;
|
|
|
|
uint64_t GetSupportedFeatures() const override {
|
|
|
|
return FEATURE_PROTO3_OPTIONAL;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
bool Generator::Generate(const protobuf::FileDescriptor* file,
|
|
|
|
const std::string& parameter,
|
|
|
|
protoc::GeneratorContext* context,
|
|
|
|
std::string* error) const {
|
|
|
|
std::vector<std::pair<std::string, std::string>> params;
|
|
|
|
google::protobuf::compiler::ParseGeneratorParameter(parameter, ¶ms);
|
|
|
|
|
|
|
|
for (const auto& pair : params) {
|
|
|
|
*error = "Unknown parameter: " + pair.first;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
Output h_def_output(context->Open(DefHeaderFilename(file->name())));
|
|
|
|
WriteDefHeader(file, h_def_output);
|
|
|
|
|
|
|
|
Output c_def_output(context->Open(DefSourceFilename(file->name())));
|
|
|
|
WriteDefSource(file, c_def_output);
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
} // namespace
|
|
|
|
} // namespace upbc
|
|
|
|
|
|
|
|
int main(int argc, char** argv) {
|
|
|
|
std::unique_ptr<google::protobuf::compiler::CodeGenerator> generator(
|
|
|
|
new upbc::Generator());
|
|
|
|
return google::protobuf::compiler::PluginMain(argc, argv, generator.get());
|
|
|
|
}
|