diff --git a/cmd/lotus-bench/main.go b/cmd/lotus-bench/main.go index 5aae99da3..303dd52c9 100644 --- a/cmd/lotus-bench/main.go +++ b/cmd/lotus-bench/main.go @@ -334,7 +334,7 @@ var sealBenchCmd = &cli.Command{ if !skipc2 { log.Info("generating winning post candidates") - wipt, err := spt(sectorSize).RegisteredWinningPoStProof() + wipt, err := spt(sectorSize, false).RegisteredWinningPoStProof() if err != nil { return err } @@ -552,7 +552,7 @@ func runSeals(sb *ffiwrapper.Sealer, sbfs *basicfs.Provider, numSectors int, par Miner: mid, Number: i, }, - ProofType: spt(sectorSize), + ProofType: spt(sectorSize, false), } start := time.Now() @@ -584,7 +584,7 @@ func runSeals(sb *ffiwrapper.Sealer, sbfs *basicfs.Provider, numSectors int, par Miner: mid, Number: i, }, - ProofType: spt(sectorSize), + ProofType: spt(sectorSize, false), } start := time.Now() @@ -795,7 +795,7 @@ var proveCmd = &cli.Command{ Miner: abi.ActorID(mid), Number: abi.SectorNumber(c2in.SectorNum), }, - ProofType: spt(abi.SectorSize(c2in.SectorSize)), + ProofType: spt(abi.SectorSize(c2in.SectorSize), false), } fmt.Printf("----\nstart proof computation\n") @@ -826,8 +826,8 @@ func bps(sectorSize abi.SectorSize, sectorNum int, d time.Duration) string { return types.SizeStr(types.BigInt{Int: bps}) + "/s" } -func spt(ssize abi.SectorSize) abi.RegisteredSealProof { - spt, err := miner.SealProofTypeFromSectorSize(ssize, build.TestNetworkVersion, false) +func spt(ssize abi.SectorSize, synth bool) abi.RegisteredSealProof { + spt, err := miner.SealProofTypeFromSectorSize(ssize, build.TestNetworkVersion, synth) if err != nil { panic(err) } diff --git a/cmd/lotus-bench/simple.go b/cmd/lotus-bench/simple.go index a742b0fb3..d19c37bc9 100644 --- a/cmd/lotus-bench/simple.go +++ b/cmd/lotus-bench/simple.go @@ -181,7 +181,7 @@ var simpleAddPiece = &cli.Command{ Miner: mid, Number: 1, }, - ProofType: spt(sectorSize), + ProofType: spt(sectorSize, false), } data, err := os.Open(cctx.Args().First()) @@ -218,6 +218,10 @@ var simplePreCommit1 = &cli.Command{ Usage: "pass miner address (only necessary if using existing sectorbuilder)", Value: "t01000", }, + &cli.BoolFlag{ + Name: "synthetic", + Usage: "generate synthetic PoRep proofs", + }, }, ArgsUsage: "[unsealed] [sealed] [cache] [[piece cid] [piece size]]...", Action: func(cctx *cli.Context) error { @@ -254,7 +258,7 @@ var simplePreCommit1 = &cli.Command{ Miner: mid, Number: 1, }, - ProofType: spt(sectorSize), + ProofType: spt(sectorSize, cctx.Bool("synthetic")), } var ticket [32]byte // all zero @@ -292,6 +296,10 @@ var simplePreCommit2 = &cli.Command{ Usage: "pass miner address (only necessary if using existing sectorbuilder)", Value: "t01000", }, + &cli.BoolFlag{ + Name: "synthetic", + Usage: "generate synthetic PoRep proofs", + }, }, ArgsUsage: "[sealed] [cache] [pc1 out]", Action: func(cctx *cli.Context) error { @@ -332,7 +340,7 @@ var simplePreCommit2 = &cli.Command{ Miner: mid, Number: 1, }, - ProofType: spt(sectorSize), + ProofType: spt(sectorSize, cctx.Bool("synthetic")), } start := time.Now() @@ -363,6 +371,10 @@ var simpleCommit1 = &cli.Command{ Usage: "pass miner address (only necessary if using existing sectorbuilder)", Value: "t01000", }, + &cli.BoolFlag{ + Name: "synthetic", + Usage: "generate synthetic PoRep proofs", + }, }, ArgsUsage: "[sealed] [cache] [comm D] [comm R] [c1out.json]", Action: func(cctx *cli.Context) error { @@ -398,7 +410,7 @@ var simpleCommit1 = &cli.Command{ Miner: mid, Number: 1, }, - ProofType: spt(sectorSize), + ProofType: spt(sectorSize, cctx.Bool("synthetic")), } start := time.Now() @@ -464,6 +476,10 @@ var simpleCommit2 = &cli.Command{ Usage: "pass miner address (only necessary if using existing sectorbuilder)", Value: "t01000", }, + &cli.BoolFlag{ + Name: "synthetic", + Usage: "generate synthetic PoRep proofs", + }, }, Action: func(c *cli.Context) error { if c.Bool("no-gpu") { @@ -510,7 +526,7 @@ var simpleCommit2 = &cli.Command{ Miner: abi.ActorID(mid), Number: abi.SectorNumber(c2in.SectorNum), }, - ProofType: spt(abi.SectorSize(c2in.SectorSize)), + ProofType: spt(abi.SectorSize(c2in.SectorSize), c.Bool("synthetic")), } start := time.Now() @@ -568,7 +584,7 @@ var simpleWindowPost = &cli.Command{ return xerrors.Errorf("parse commr: %w", err) } - wpt, err := spt(sectorSize).RegisteredWindowPoStProof() + wpt, err := spt(sectorSize, false).RegisteredWindowPoStProof() if err != nil { return err } @@ -588,7 +604,7 @@ var simpleWindowPost = &cli.Command{ vp, err := ffi.GenerateSingleVanillaProof(ffi.PrivateSectorInfo{ SectorInfo: prf.SectorInfo{ - SealProof: spt(sectorSize), + SealProof: spt(sectorSize, false), SectorNumber: sn, SealedCID: commr, }, @@ -655,7 +671,7 @@ var simpleWinningPost = &cli.Command{ return xerrors.Errorf("parse commr: %w", err) } - wpt, err := spt(sectorSize).RegisteredWinningPoStProof() + wpt, err := spt(sectorSize, false).RegisteredWinningPoStProof() if err != nil { return err } @@ -675,7 +691,7 @@ var simpleWinningPost = &cli.Command{ vp, err := ffi.GenerateSingleVanillaProof(ffi.PrivateSectorInfo{ SectorInfo: prf.SectorInfo{ - SealProof: spt(sectorSize), + SealProof: spt(sectorSize, false), SectorNumber: sn, SealedCID: commr, }, @@ -758,7 +774,7 @@ var simpleReplicaUpdate = &cli.Command{ Miner: mid, Number: 1, }, - ProofType: spt(sectorSize), + ProofType: spt(sectorSize, false), } start := time.Now() @@ -826,7 +842,7 @@ var simpleProveReplicaUpdate1 = &cli.Command{ Miner: mid, Number: 1, }, - ProofType: spt(sectorSize), + ProofType: spt(sectorSize, false), } start := time.Now() @@ -913,7 +929,7 @@ var simpleProveReplicaUpdate2 = &cli.Command{ Miner: mid, Number: 1, }, - ProofType: spt(sectorSize), + ProofType: spt(sectorSize, false), } start := time.Now()