From 318dabfa4bd68711900f59cbc9d75c7b1d15d958 Mon Sep 17 00:00:00 2001
From: Joshua MacDonald <josh.macdonald@gmail.com>
Date: Sat, 26 Dec 2015 21:44:56 -0800
Subject: Sum and print summary by source window size

---
 xdelta3/go/src/regtest.go | 59 +++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 52 insertions(+), 7 deletions(-)

diff --git a/xdelta3/go/src/regtest.go b/xdelta3/go/src/regtest.go
index 7b23ce0..f5c5480 100644
--- a/xdelta3/go/src/regtest.go
+++ b/xdelta3/go/src/regtest.go
@@ -66,9 +66,28 @@ type PairTest struct {
 	source, target string
 
 	// Output
+	TestOutput
+}
+
+type TestOutput struct {
 	encoded int64
 	encDuration time.Duration
 	decDuration time.Duration
+	encSysDuration time.Duration
+	decSysDuration time.Duration
+}
+
+func (to *TestOutput) Add(a TestOutput) {
+	to.encoded += a.encoded
+	to.encDuration += a.encDuration
+	to.decDuration += a.decDuration
+	to.encSysDuration += a.encSysDuration
+	to.decSysDuration += a.decSysDuration
+}
+
+func (to *TestOutput) String() string {
+	return fmt.Sprintf("SIZE: %v\tTIME: %v",
+		to.encoded, to.encDuration)
 }
 
 // P is the test program, Q is the reference version.
@@ -91,6 +110,8 @@ func (cfg Config) datasetTest(t *xdelta.TestGroup, p, q xdelta.Program) {
 		total += d.Size()
 	}
 	meansize := total / int64(len(dents))
+	testSum := map[uint]*TestOutput{}
+	compSum := map[uint]*TestOutput{}
 	for _, in1 := range paths {
 		for _, in2 := range paths {
 			if in1 == in2 { continue }
@@ -99,26 +120,46 @@ func (cfg Config) datasetTest(t *xdelta.TestGroup, p, q xdelta.Program) {
 			for ; largest <= 31 && 1<<largest < meansize; largest++ {}
 
 			// 1/4, 1/2, and 1/1 of the power-of-2 rounded-up mean size
+			// TODO NOTE
 			for b := largest - 2; b <= largest; b++ {
+				if _, has := testSum[b]; !has {
+					testSum[b] = &TestOutput{}
+					compSum[b] = &TestOutput{}
+				}
 				c1 := cfg
 				c1.srcbuf_size = 1<<b
-				ptest := &PairTest{c1, p, in1, in2, -1, 0, 0}
+				ptest := &PairTest{c1, p, in1, in2, TestOutput{-1, 0, 0, 0, 0}}
 				ptest.datasetPairTest(t, 1<<b);
-				qtest := &PairTest{c1, q, in1, in2, -1, 0, 0}
+				qtest := &PairTest{c1, q, in1, in2, TestOutput{-1, 0, 0, 0, 0}}
 				qtest.datasetPairTest(t, 1<<b)
 
- 				fmt.Printf("%s, %s: %+d/%db, E:%s/%s D:%s/%s [B=%d]\n",
+				testSum[b].Add(ptest.TestOutput)
+				compSum[b].Add(qtest.TestOutput)
+
+ 				fmt.Printf("%s, %s: %.2f%% %+d/%d\n\tE:%.2f%%/%s(%.2f%%/%s) D:%.2f%%/%s(%.2f%%/%s) [B=%d]\n",
 					path.Base(in1), path.Base(in2),
+					float64(ptest.encoded - qtest.encoded) * 100.0 / float64(qtest.encoded),
 					ptest.encoded - qtest.encoded,
 					qtest.encoded,
-					(ptest.encDuration - qtest.encDuration).String(),
+					(ptest.encDuration - qtest.encDuration).Seconds() * 100.0 / qtest.encDuration.Seconds(),
+					qtest.encDuration,
+					(ptest.decDuration - qtest.decDuration).Seconds() * 100.0 / qtest.decDuration.Seconds(),
 					qtest.encDuration,
-					(ptest.decDuration - qtest.decDuration).String(),
-					qtest.decDuration,
+					(ptest.encSysDuration - qtest.encSysDuration).Seconds() * 100.0 / qtest.encSysDuration.Seconds(),
+					qtest.encSysDuration,
+					(ptest.decSysDuration - qtest.decSysDuration).Seconds() * 100.0 / qtest.decSysDuration.Seconds(),
+					qtest.decSysDuration,
 					1<<b)
 			}
 		}
 	}
+	var keys []uint
+	for k, _ := range testSum {
+		keys = append(keys, k)
+	}
+	for _, k := range keys {		
+		fmt.Printf("B=%v\nTEST: %v\nCOMP: %v\n", 1<<k, testSum[k], compSum[k])
+	}
 }
 
 func (pt *PairTest) datasetPairTest(t *xdelta.TestGroup, meanSize int64) {
@@ -131,7 +172,9 @@ func (pt *PairTest) datasetPairTest(t *xdelta.TestGroup, meanSize int64) {
 		t.Panic(err)
 	}
 
-	dargs := []string{"-dc", fmt.Sprint("-B", cfg.srcbuf_size), //"-q",
+	// TODO HACK "* 2" for known / fixed bug in decoder. Helps compare
+	// encoder perf in reasonable time, makes invalid decoder results.
+	dargs := []string{"-dc", fmt.Sprint("-B", cfg.srcbuf_size * 2), //"-q",
 		fmt.Sprint("-W", cfg.window_size), "-s", pt.source}
 	dec, err := t.Exec("decode", pt.program, false, dargs)
 	if err != nil {
@@ -154,6 +197,8 @@ func (pt *PairTest) datasetPairTest(t *xdelta.TestGroup, meanSize int64) {
 
 	pt.decDuration = dec.Cmd.ProcessState.UserTime()
 	pt.encDuration = enc.Cmd.ProcessState.UserTime()
+	pt.decSysDuration = dec.Cmd.ProcessState.SystemTime()
+	pt.encSysDuration = enc.Cmd.ProcessState.SystemTime()
 }
 
 func (cfg Config) offsetTest(t *xdelta.TestGroup, p xdelta.Program, offset, length int64) {
-- 
cgit v1.2.3