solfuzz: allow building without flatcc

Author: riptl

src/flamenco/runtime/tests/Local.mk

@@ -1,6 +1,5 @@
 ifdef FD_HAS_SECP256K1
 
-ifdef FD_HAS_FLATCC
 $(call add-hdrs,fd_solfuzz.h)
 $(call add-objs,fd_solfuzz fd_solfuzz_exec,fd_flamenco_test)
 
@@ -26,5 +25,3 @@ endif
 
 run-runtime-backtest: $(OBJDIR)/bin/fd_ledger $(OBJDIR)/bin/firedancer-dev
 	OBJDIR=$(OBJDIR) src/flamenco/runtime/tests/run_backtest_ci.sh $(BACKTEST_ARGS)
-
-endif

src/flamenco/runtime/tests/fd_dump_pb.h

@@ -1,8 +1,6 @@
 #ifndef HEADER_fd_src_flamenco_runtime_tests_fd_dump_pb_h
 #define HEADER_fd_src_flamenco_runtime_tests_fd_dump_pb_h
 
-#if FD_HAS_FLATCC
-
 /* fd_dump_pb.h provides APIs for dumping syscalls, instructions, transactions, and blocks
    into a digestable and replayable Protobuf message. This is useful for debugging
    ledger test mismatches, collecting seed corpora, and gathering real data to test
@@ -211,6 +209,4 @@ fd_dump_elf_to_protobuf( fd_exec_txn_ctx_t * txn_ctx,
 
 FD_PROTOTYPES_END
 
-#endif /* FD_HAS_FLATCC */
-
 #endif /* HEADER_fd_src_flamenco_runtime_tests_fd_dump_pb_h */

src/flamenco/runtime/tests/fd_elf_harness.c

@@ -1,15 +1,17 @@
 #include "fd_solfuzz.h"
 #include "fd_solfuzz_private.h"
-#include "flatbuffers/generated/flatbuffers_common_builder.h"
-#include "flatbuffers/generated/flatbuffers_common_reader.h"
 #include "generated/elf.pb.h"
 #include "../../../ballet/sbpf/fd_sbpf_loader.h"
 #include "../program/fd_bpf_loader_program.h"
 #include "../../vm/fd_vm_base.h"
 #include "../../progcache/fd_prog_load.h"
 
+#if FD_HAS_FLATCC
+#include "flatbuffers/generated/flatbuffers_common_builder.h"
+#include "flatbuffers/generated/flatbuffers_common_reader.h"
 #include "flatbuffers/generated/elf_reader.h"
 #include "flatbuffers/generated/elf_builder.h"
+#endif
 
 #define SORT_NAME        sort_ulong
 #define SORT_KEY_T       ulong
@@ -140,6 +142,8 @@ fd_solfuzz_pb_elf_loader_run( fd_solfuzz_runner_t * runner,
   return actual_end - (ulong) output_buf;
 }
 
+#if FD_HAS_FLATCC
+
 void
 fd_solfuzz_fb_elf_loader_build_err_effects( fd_solfuzz_runner_t * runner, int err ) {
   FD_TEST( !SOL_COMPAT_NS(ELFLoaderEffects_start_as_root)( runner->fb_builder ) );
@@ -246,3 +250,5 @@ fd_solfuzz_fb_elf_loader_run( fd_solfuzz_runner_t * runner,
 
   return SOL_COMPAT_V2_SUCCESS;
 }
+
+#endif /* FD_HAS_FLATCC */

src/flamenco/runtime/tests/fd_harness_common.c

@@ -70,6 +70,8 @@ fd_solfuzz_pb_restore_features( fd_features_t *                    features,
   return 1;
 }
 
+#if FD_HAS_FLATCC
+
 void
 fd_solfuzz_fb_restore_features( fd_features_t *                    features,
                                 SOL_COMPAT_NS(FeatureSet_table_t)  feature_set ) {
@@ -88,3 +90,5 @@ fd_solfuzz_fb_restore_features( fd_features_t *                    features,
     fd_features_set( features, id, 0UL );
   }
 }
+
+#endif /* FD_HAS_FLATCC */

src/flamenco/runtime/tests/fd_sol_compat.c

@@ -15,8 +15,10 @@
 #include "generated/txn.pb.h"
 #include "generated/type.pb.h"
 
+#if FD_HAS_FLATCC
 #include "flatbuffers/generated/elf_reader.h"
 #include "flatbuffers/generated/flatbuffers_common_reader.h"
+#endif
 
 #include <assert.h>
 #include <errno.h>
@@ -310,6 +312,8 @@ sol_compat_shred_parse_v1( uchar *       out,
    TODO: Make sol_compat_v2 APIs infallible???
  */
 
+#if FD_HAS_FLATCC
+
 int
 sol_compat_elf_loader_v2( uchar *            out,
                           ulong *            out_sz,
@@ -327,3 +331,5 @@ sol_compat_elf_loader_v2( uchar *            out,
 
   return SOL_COMPAT_V2_SUCCESS;
 }
+
+#endif /* FD_HAS_FLATCC */

src/flamenco/runtime/tests/fd_solfuzz.c

@@ -117,10 +117,12 @@ fd_solfuzz_runner_new( fd_wksp_t *                         wksp,
   runner->runtime_stack = fd_wksp_alloc_laddr( wksp, alignof(fd_runtime_stack_t), sizeof(fd_runtime_stack_t), wksp_tag );
   if( FD_UNLIKELY( !runner->runtime_stack ) ) goto bail2;
 
+# if FD_HAS_FLATCC
   /* TODO: Consider implementing custom allocators and emitters.
      The default builder / emitter uses libc allocators */
   int builder_err = flatcc_builder_init( runner->fb_builder );
   if( FD_UNLIKELY( builder_err ) ) goto bail2;
+# endif
 
   runner->spad = fd_spad_join( fd_spad_new( spad_mem, spad_max ) );
   if( FD_UNLIKELY( !runner->spad ) ) goto bail2;
@@ -166,7 +168,9 @@ fd_solfuzz_runner_delete( fd_solfuzz_runner_t * runner ) {
   fd_progcache_admin_leave( runner->progcache_admin, &shpcache );
   if( shpcache ) fd_wksp_free_laddr( fd_funk_delete( shpcache ) );
 
+# if FD_HAS_FLATCC
   flatcc_builder_clear( runner->fb_builder );
+# endif
 
   if( runner->spad  ) fd_wksp_free_laddr( fd_spad_delete( fd_spad_leave( runner->spad ) ) );
   if( runner->banks ) fd_wksp_free_laddr( fd_banks_delete( fd_banks_leave( runner->banks ) ) );

src/flamenco/runtime/tests/fd_solfuzz.h

@@ -15,7 +15,9 @@
 #include "../../accdb/fd_accdb_user.h"
 #include "../../progcache/fd_progcache_admin.h"
 #include "../../progcache/fd_progcache_user.h"
+#if FD_HAS_FLATCC
 #include "flatcc/flatcc_builder.h"
+#endif
 
 /* A fd_solfuzz_runner_t object processes solfuzz inputs.  Can be reused
    for different inputs, even of different types.  Single-thread per
@@ -43,7 +45,9 @@ struct fd_solfuzz_runner {
   fd_exec_accounts_t * exec_accounts;
   fd_runtime_stack_t * runtime_stack;
 
+# if FD_HAS_FLATCC
   flatcc_builder_t     fb_builder[1]; /* Persistent flatbuffers builder */
+# endif
 
   int enable_vm_tracing;
 };
@@ -176,9 +180,11 @@ fd_solfuzz_pb_elf_loader_run( fd_solfuzz_runner_t * runner,
                               void *                output_buf,
                               ulong                 output_bufsz );
 
+#if FD_HAS_FLATCC
 int
 fd_solfuzz_fb_elf_loader_run( fd_solfuzz_runner_t * runner,
                               void const *          input_ );
+#endif
 
 int
 fd_solfuzz_pb_elf_loader_fixture( fd_solfuzz_runner_t * runner,

src/flamenco/runtime/tests/fd_solfuzz_private.h

@@ -10,8 +10,10 @@
 #include "../../../ballet/nanopb/pb_decode.h"
 #include "generated/context.pb.h"
 
+#if FD_HAS_FLATCC
 #include "flatcc/flatcc_builder.h"
 #include "flatbuffers/generated/context_reader.h"
+#endif
 
 FD_PROTOTYPES_BEGIN
 
@@ -37,12 +39,14 @@ int
 fd_solfuzz_pb_restore_features( fd_features_t *                    features,
                                 fd_exec_test_feature_set_t const * feature_set );
 
+#if FD_HAS_FLATCC
 /* Flatbuffers variant of the above. This function call should never
    fail (all passed in features should be supported). Throws FD_LOG_ERR
    if any unsupported features are inputted. */
 void
 fd_solfuzz_fb_restore_features( fd_features_t *                   features,
                                 SOL_COMPAT_NS(FeatureSet_table_t) feature_set );
+#endif
 
 typedef ulong( exec_test_run_pb_fn_t )( fd_solfuzz_runner_t *,
                                         void const *,
@@ -67,17 +71,19 @@ fd_solfuzz_pb_execute_wrapper( fd_solfuzz_runner_t *   runner,
 
 typedef int( exec_test_run_fb_fn_t )( fd_solfuzz_runner_t *, void const * );
 
+#if FD_HAS_FLATCC
 /* Returns SOL_COMPAT_V2_SUCCESS on success and SOL_COMPAT_V2_FAILURE on
    failure */
 static inline int
 fd_solfuzz_fb_execute_wrapper( fd_solfuzz_runner_t *   runner,
                                void const *            input,
                                exec_test_run_fb_fn_t * exec_test_run_fn ) {
-FD_SPAD_FRAME_BEGIN( runner->spad ) {
-  flatcc_builder_reset( runner->fb_builder );
-  return exec_test_run_fn( runner, input );
-} FD_SPAD_FRAME_END;
+  FD_SPAD_FRAME_BEGIN( runner->spad ) {
+    flatcc_builder_reset( runner->fb_builder );
+    return exec_test_run_fn( runner, input );
+  } FD_SPAD_FRAME_END;
 }
+#endif /* FD_HAS_FLATCC */
 
 /* Utils */