Bump 200sc/bebop to latest, standardize with other bebop implementation (alecthomas#124)

Also note the nature of timestamps in bebop near the other timestamp related notes in the readme.

Author: 200sc

Makefile

@@ -43,8 +43,8 @@ structdef-pulsar.pulsar.go: structdef-pulsar.proto
 structdefxdr_generated.go: structdefxdr.go
 	go run github.com/calmh/xdr/cmd/genxdr@latest -o structdefxdr_generated.go structdefxdr.go
 
-structdef-bebop.go:
-	go run github.com/200sc/bebop/main/bebopc-go@latest -i structdef-bebop.bop -o structdef-bebop.go --package goserbench
+structdef-bebop-200sc.go:
+	go run github.com/200sc/bebop/main/bebopc-go@latest -i structdef-bebop-200sc.bop -o structdef-bebop-200sc.go --package goserbench --force-pointer-receivers
 
 structdef-bebop-wellquite.go: structdef-bebop-wellquite.bop
 	go run wellquite.org/bebop/cmd/bebop -i ./structdef-bebop-wellquite.bop -o ./structdef-bebop-wellquite.go -p github.com/alecthomas/go_serialization_benchmarks/goserbench

README.md

@@ -3,7 +3,7 @@ module github.com/alecthomas/go_serialization_benchmarks
 go 1.20
 
 require (
-	github.com/200sc/bebop v0.3.3
+	github.com/200sc/bebop v0.5.0
 	github.com/Sereal/Sereal v0.0.0-20230201113653-fa72c87b650e
 	github.com/alecthomas/binary v0.0.0-20221018225505-74871811ee56
 	github.com/calmh/xdr v1.1.0

go.mod

@@ -13,6 +13,16 @@ cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiy
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/200sc/bebop v0.3.3 h1:8qVg4KvSJnMYSNiwm/slo2VDvdBwzrTm9/EEOM4ojW0=
 github.com/200sc/bebop v0.3.3/go.mod h1:M+32fmqkfn58CcIc04BclGJTBAMQqG+6EftZcByArPA=
+github.com/200sc/bebop v0.4.1-0.20231110133633-66fb1b34c59d h1:/15rV/Sp7sNj40ufy+ChNall4PgmSZ4mqq3o4qh60HA=
+github.com/200sc/bebop v0.4.1-0.20231110133633-66fb1b34c59d/go.mod h1:4be7DOSfft4lpk3dMfE0mSAF8+ri00t5tdMHbw2oicE=
+github.com/200sc/bebop v0.4.1-0.20231110135718-c7d459316765 h1:1ArZuG2giCnuWUS/ztYVcbRZunwt1e7HwkSRWIFSFd4=
+github.com/200sc/bebop v0.4.1-0.20231110135718-c7d459316765/go.mod h1:4be7DOSfft4lpk3dMfE0mSAF8+ri00t5tdMHbw2oicE=
+github.com/200sc/bebop v0.4.1-0.20231110150503-575c4aa91039 h1:PKAAq2QiEaRWk3eCV9opEu3PxJ+D6oZY+NhQE602ej8=
+github.com/200sc/bebop v0.4.1-0.20231110150503-575c4aa91039/go.mod h1:4be7DOSfft4lpk3dMfE0mSAF8+ri00t5tdMHbw2oicE=
+github.com/200sc/bebop v0.4.1-0.20231110150946-8c7bf3b94ace h1:wrmH3ycX7LEo+LtT4GNJ/s98MtUPjX2YkLJ/LY8VDYA=
+github.com/200sc/bebop v0.4.1-0.20231110150946-8c7bf3b94ace/go.mod h1:4be7DOSfft4lpk3dMfE0mSAF8+ri00t5tdMHbw2oicE=
+github.com/200sc/bebop v0.5.0 h1:3dmQNCw4SZaik5E6eUbrwWzJDWi21W2v9MR5ehHSw8c=
+github.com/200sc/bebop v0.5.0/go.mod h1:4be7DOSfft4lpk3dMfE0mSAF8+ri00t5tdMHbw2oicE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/DataDog/zstd v1.5.2 h1:vUG4lAyuPCXO0TLbXvPv7EB7cNK1QV/luu55UHLrrn8=

go.sum

@@ -1593,13 +1593,13 @@ func Benchmark_Enkodo_Unmarshal(b *testing.B) {
 
 // github.com/200sc/bebop
 
-func generateBebopA() []*BebopBufA {
-	a := make([]*BebopBufA, 0, 1000)
+func generateBebop200sc() []*BebopBuf200sc {
+	a := make([]*BebopBuf200sc, 0, 1000)
 	for i := 0; i < 1000; i++ {
-		a = append(a, &BebopBufA{
+		a = append(a, &BebopBuf200sc{
 			Name: randString(16),
 			// bebop does support times, but as 100-nanosecond ticks, losing some precision
-			BirthDay: uint64(time.Now().UnixNano()),
+			BirthDay: time.Now().Round(100 * time.Nanosecond),
 			Phone:    randString(10),
 			Siblings: rand.Int31n(5),
 			Spouse:   rand.Intn(2) == 1,
@@ -1609,8 +1609,8 @@ func generateBebopA() []*BebopBufA {
 	return a
 }
 
-func Benchmark_Bebop_Marshal(b *testing.B) {
-	data := generateBebopA()
+func Benchmark_Bebop_200sc_Marshal(b *testing.B) {
+	data := generateBebop200sc()
 	b.ReportAllocs()
 	b.ResetTimer()
 	var serialSize int
@@ -1621,9 +1621,9 @@ func Benchmark_Bebop_Marshal(b *testing.B) {
 	b.ReportMetric(float64(serialSize)/float64(b.N), "B/serial")
 }
 
-func Benchmark_Bebop_Unmarshal(b *testing.B) {
+func Benchmark_Bebop_200sc_Unmarshal(b *testing.B) {
 	b.StopTimer()
-	data := generateBebopA()
+	data := generateBebop200sc()
 	ser := make([][]byte, len(data))
 	var serialSize int
 	for i, d := range data {
@@ -1636,15 +1636,15 @@ func Benchmark_Bebop_Unmarshal(b *testing.B) {
 
 	for i := 0; i < b.N; i++ {
 		n := rand.Intn(len(ser))
-		o := BebopBufA{}
+		o := BebopBuf200sc{}
 		err := o.UnmarshalBebop(ser[n])
 		if err != nil {
 			b.Fatalf("bebop failed to unmarshal: %s (%s)", err, ser[n])
 		}
 		// Validate unmarshalled data.
 		if validate != "" {
 			i := data[n]
-			correct := o.Name == i.Name && o.Phone == i.Phone && o.Siblings == i.Siblings && o.Spouse == i.Spouse && o.Money == i.Money && o.BirthDay == i.BirthDay
+			correct := o.Name == i.Name && o.Phone == i.Phone && o.Siblings == i.Siblings && o.Spouse == i.Spouse && o.Money == i.Money && o.BirthDay.Equal(i.BirthDay)
 			if !correct {
 				b.Fatalf("unmarshaled object differed:\n%v\n%v", i, o)
 			}

serialization_benchmarks_test.go

@@ -1,6 +1,6 @@
-struct BebopBufA {
+struct BebopBuf200sc {
   string name;
-  uint64 birthDay;
+  date birthDay;
   string phone;
   int32 siblings;
   bool spouse;