From a202ce962940debd0f1f40dcaed158f754639739 Mon Sep 17 00:00:00 2001
From: Joshua Haberman <jhaberman@gmail.com>
Date: Fri, 18 Sep 2020 12:45:46 -0700
Subject: [PATCH] Add UPB_FORCEINLINE for varint32 decoding.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This speeds up the decoder by >20% and also reduces code size slightly!

name                       old time/op  new time/op  delta
ArenaOneAlloc              20.4ns ± 0%  20.2ns ± 0%   -1.10%  (p=0.000 n=12+11)
ArenaInitialBlockOneAlloc  5.25ns ± 0%  5.25ns ± 0%     ~     (p=0.786 n=11+12)
ParseDescriptorNoHeap      17.1µs ± 0%  13.1µs ± 0%  -23.29%  (p=0.000 n=11+12)
ParseDescriptor            17.4µs ± 1%  13.5µs ± 1%  -22.51%  (p=0.000 n=12+12)
SerializeDescriptor        10.7µs ± 0%  10.9µs ± 0%   +1.95%  (p=0.000 n=12+12)

    FILE SIZE        VM SIZE
 --------------  --------------
  +2.7%     +16   +2.7%     +16    [LOAD #2 [RX]]
  +0.5%     +16   [ = ]       0    [Unmapped]
  -1.4%     -72   -0.7%     -32    upb/decode.c
      +3.1%     +98   +3.1%     +98    decode_msg
      [DEL]    -170   [DEL]    -130    decode_varint32
  -0.0%     -40   -0.0%     -16    TOTAL
---
 benchmark.py | 2 +-
 upb/decode.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/benchmark.py b/benchmark.py
index 4a6e9f839b..b75dd4d5a8 100755
--- a/benchmark.py
+++ b/benchmark.py
@@ -15,7 +15,7 @@ import tempfile
 @contextlib.contextmanager
 def GitWorktree(commit):
   tmpdir = tempfile.mkdtemp()
-  subprocess.run(['git', 'worktree', 'add', '-q', tmpdir, commit], check=True)
+  subprocess.run(['git', 'worktree', 'add', '-q', '-d', tmpdir, commit], check=True)
   cwd = os.getcwd()
   os.chdir(tmpdir)
   try:
diff --git a/upb/decode.c b/upb/decode.c
index a9f1cf548a..416ea25cc5 100644
--- a/upb/decode.c
+++ b/upb/decode.c
@@ -227,6 +227,7 @@ static const char *decode_varint64(upb_decstate *d, const char *ptr,
   }
 }
 
+UPB_FORCEINLINE
 static const char *decode_varint32(upb_decstate *d, const char *ptr,
                                    const char *limit, uint32_t *val) {
   uint64_t u64;