From 8ef6873e0e14309a1715a252a650bab0ae1a33ef Mon Sep 17 00:00:00 2001
From: Josh Haberman <jhaberman@gmail.com>
Date: Sun, 20 Mar 2011 13:13:51 -0700
Subject: upb_stream: all callbacks registered ahead-of-time.

This is a significant change to the upb_stream
protocol, and should hopefully be the last
significant change.

All callbacks are now registered ahead-of-time
instead of having delegated callbacks registered
at runtime, which makes it much easier to
aggressively optimize ahead-of-time (like with a
JIT).

Other impacts of this change:

- You no longer need to have loaded descriptor.proto
  as a upb_def to load other descriptors!  This means
  the special-case code we used for bootstrapping is
  no longer necessary, and we no longer need to link
  the descriptor for descriptor.proto into upb.

- A client can now register any upb_value as what
  will be delivered to their value callback, not
  just a upb_fielddef*.  This should allow for other
  clients to get more bang out of the streaming
  decoder.

This change unfortunately causes a bit of a performance
regression -- I think largely due to highly
suboptimal code that GCC generates when structs
are returned by value.  See:
  http://blog.reverberate.org/2011/03/19/when-a-compilers-slow-code-actually-bites-you/

On the other hand, once we have a JIT this should
no longer matter.

Performance numbers:

plain.parsestream_googlemessage1.upb_table: 374 -> 396 (5.88)
plain.parsestream_googlemessage2.upb_table: 616 -> 449 (-27.11)
plain.parsetostruct_googlemessage1.upb_table_byref: 268 -> 269 (0.37)
plain.parsetostruct_googlemessage1.upb_table_byval: 215 -> 204 (-5.12)
plain.parsetostruct_googlemessage2.upb_table_byref: 307 -> 281 (-8.47)
plain.parsetostruct_googlemessage2.upb_table_byval: 297 -> 272 (-8.42)
omitfp.parsestream_googlemessage1.upb_table: 423 -> 410 (-3.07)
omitfp.parsestream_googlemessage2.upb_table: 679 -> 483 (-28.87)
omitfp.parsetostruct_googlemessage1.upb_table_byref: 287 -> 282 (-1.74)
omitfp.parsetostruct_googlemessage1.upb_table_byval: 226 -> 219 (-3.10)
omitfp.parsetostruct_googlemessage2.upb_table_byref: 315 -> 298 (-5.40)
omitfp.parsetostruct_googlemessage2.upb_table_byval: 297 -> 287 (-3.37)
---
 Makefile | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 09eb1ad..41e4c8f 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ CC=gcc
 CXX=g++
 CFLAGS=-std=c99
 INCLUDE=-Isrc -Itests -I.
-CPPFLAGS=$(INCLUDE) -Wall -Wextra -Wno-missing-field-initializers $(USER_CFLAGS)
+CPPFLAGS=$(INCLUDE) -Wall -Wextra $(USER_CFLAGS)
 LDLIBS=-lpthread src/libupb.a
 
 # Build with "make Q=" to see all commands that are being executed.
@@ -69,28 +69,28 @@ $(ALLSRC): perf-cppflags
 
 # Every source file used in upb should appear here.
 
-# The core library -- the absolute minimum you must compile in to successfully
-# bootstrap.
+# The core library.
 CORE= \
   src/upb.c \
+  src/upb_stream.c \
   src/upb_table.c \
   src/upb_string.c \
   src/upb_def.c \
+  src/upb_msg.c \
 
-# Common encoders/decoders and upb_msg -- you're almost certain to want these.
+# Common encoders/decoders -- you're almost certain to want these.
 STREAM= \
   src/upb_decoder.c \
   src/upb_stdio.c \
   src/upb_textprinter.c \
   src/upb_strstream.c \
-  src/upb_msg.c \
   src/upb_glue.c \
 
 ASMCORE= \
   src/upb_decoder_x64.asm
 
 # Parts of core that are yet to be converted.
-OTHERSRC=src/upb_encoder.c src/upb_text.c
+OTHERSRC=src/upb_encoder.c
 
 BENCHMARKS_SRC= \
   benchmarks/main.c \
@@ -100,12 +100,13 @@ BENCHMARKS_SRC= \
 TESTS_SRC= \
   tests/test_decoder.c \
   tests/test_def.c \
-  tests/test_stream.c \
   tests/test_string.c \
   tests/tests.c \
   tests/tests_varint.c \
   tests/test_vs_proto2.cc
 
+  #tests/test_stream.c \
+
 ALLSRC=$(CORE) $(STREAM) $(BENCHMARKS_SRC) $(TESTS_SRC)
 
 
@@ -184,7 +185,6 @@ src/descriptor.pb: src/descriptor.proto
 descriptorgen: src/descriptor.pb src/upbc
 	@# Regenerate descriptor_const.h
 	./src/upbc -o src/descriptor src/descriptor.pb
-	cd src && xxd -i descriptor.pb > descriptor.c
 
 src/upbc: src/upbc.c $(LIBUPB)
 
@@ -201,10 +201,10 @@ tests/test.proto.pb: tests/test.proto
 SIMPLE_TESTS= \
   tests/test_string \
   tests/test_def \
-  tests/test_stream \
   tests/test_varint \
   tests/tests
 #    tests/test_decoder \
+  tests/test_stream \
 
 SIMPLE_CXX_TESTS= \
   tests/test_table
-- 
cgit v1.2.3