feat: array of piece count / blocks per piece (#1314)

extern/boostd-data/bench/common.go

@@ -1,12 +1,21 @@
 package main
 
-import "github.com/urfave/cli/v2"
+import (
+	"github.com/urfave/cli/v2"
+	"strconv"
+	"strings"
+)
 
 var commonFlags = []cli.Flag{
 	&cli.IntFlag{
 		Name:  "piece-add-parallelism",
 		Value: 2,
 	},
+	&cli.StringSliceFlag{
+		Name:  "pieces",
+		Usage: "Array of piece count / blocks per piece in the form '<piece count>x<blocks per piece>' (eg '10x128')",
+		Value: cli.NewStringSlice("30x1024"),
+	},
 	&cli.IntFlag{
 		Name:  "piece-count",
 		Value: 30,
@@ -33,11 +42,36 @@ var commonFlags = []cli.Flag{
 	},
 }
 
+const piecesUsageErr = "pieces parameter must be of the form <piece count>x<blocks per piece>"
+
 func runOptsFromCctx(cctx *cli.Context) runOpts {
+	pieces := cctx.StringSlice("pieces")
+	addPiecesSpecs := make([]addPiecesSpec, 0, len(pieces))
+	for _, pc := range pieces {
+		countBlocks := strings.Split(pc, "x")
+		if len(countBlocks) != 2 {
+			panic(piecesUsageErr)
+		}
+
+		pieceCount, err := strconv.Atoi(countBlocks[0])
+		if err != nil {
+			panic(piecesUsageErr)
+		}
+
+		blocksPerPiece, err := strconv.Atoi(countBlocks[1])
+		if err != nil {
+			panic(piecesUsageErr)
+		}
+
+		addPiecesSpecs = append(addPiecesSpecs, addPiecesSpec{
+			pieceCount:     pieceCount,
+			blocksPerPiece: blocksPerPiece,
+		})
+	}
+
 	return runOpts{
+		addPiecesSpecs:            addPiecesSpecs,
 		pieceParallelism:          cctx.Int("piece-add-parallelism"),
-		blocksPerPiece:            cctx.Int("blocks-per-piece"),
-		pieceCount:                cctx.Int("piece-count"),
 		bitswapFetchCount:         cctx.Int("bs-fetch-count"),
 		bitswapFetchParallelism:   cctx.Int("bs-fetch-parallelism"),
 		graphsyncFetchCount:       cctx.Int("gs-fetch-count"),

extern/boostd-data/bench/run.go

@@ -33,10 +33,14 @@ type BenchDB interface {
 	GetIterableIndex(ctx context.Context, pieceCid cid.Cid) (carindex.IterableIndex, error)
 }
 
+type addPiecesSpec struct {
+	pieceCount     int
+	blocksPerPiece int
+}
+
 type runOpts struct {
+	addPiecesSpecs            []addPiecesSpec
 	pieceParallelism          int
-	blocksPerPiece            int
-	pieceCount                int
 	bitswapFetchCount         int
 	bitswapFetchParallelism   int
 	graphsyncFetchCount       int
@@ -60,8 +64,10 @@ func run(ctx context.Context, db BenchDB, opts runOpts) error {
 	}()
 
 	// Add sample data to the database
-	if err := addPieces(ctx, db, opts.pieceParallelism, opts.pieceCount, opts.blocksPerPiece); err != nil {
-		return err
+	for _, pc := range opts.addPiecesSpecs {
+		if err := addPieces(ctx, db, opts.pieceParallelism, pc.pieceCount, pc.blocksPerPiece); err != nil {
+			return err
+		}
 	}
 
 	// Run bitswap fetch simulation
@@ -89,7 +95,13 @@ func loadCmd(createDB func(context.Context, string) (BenchDB, error)) *cli.Comma
 			}
 
 			opts := runOptsFromCctx(cctx)
-			return addPieces(ctx, db, opts.pieceParallelism, opts.pieceCount, opts.blocksPerPiece)
+			for _, pc := range opts.addPiecesSpecs {
+				err = addPieces(ctx, db, opts.pieceParallelism, pc.pieceCount, pc.blocksPerPiece)
+				if err != nil {
+					return err
+				}
+			}
+			return nil
 		},
 	}
 }