spectral-norm

make regexp-dna use bytes not strings (no significant timing change)

R=rsc
DELTA=149  (138 added, 1 deleted, 10 changed)
OCL=32804
CL=32807

1 files changed, 10 insertions, 10 deletions

diff --git a/test/bench/regex-dna.go b/test/bench/regex-dna.go
index c0ade94e7..ee4ddfd50 100644
--- a/test/bench/regex-dna.go
+++ b/test/bench/regex-dna.go
@@ -40,6 +40,7 @@ import (
 	"io";
 	"os";
 	"regexp";
+	"strings";
 )
 
 func compile(s string) *regexp.Regexp {
@@ -81,17 +82,17 @@ var substs = [] Subst {
 	Subst {"Y", "(c|t)"},
 }
 
-func countMatches(pat, str string) int {
+func countMatches(pat string, bytes []byte) int {
 	re := compile(pat);
 	n := 0;
 	pos := 0;
 	for {
-		e := re.Execute(str);
+		e := re.Execute(bytes);
 		if len(e) == 0 {
 			break;
 		}
 		n++;
-		str = str[e[1]:len(str)];
+		bytes = bytes[e[1]:len(bytes)];
 	}
 	return n;
 }
@@ -102,16 +103,15 @@ func main() {
 		fmt.Fprintf(os.Stderr, "can't read input: %s\n", err);
 		os.Exit(2);
 	}
-	str := string(bytes);
-	ilen := len(str);
+	ilen := len(bytes);
 	// Delete the comment lines and newlines
-	str = compile("(>[^\n]+)?\n").ReplaceAll(str, "");
-	clen := len(str);
+	bytes = compile("(>[^\n]+)?\n").ReplaceAll(bytes, []byte{});
+	clen := len(bytes);
 	for i, s := range variants {
-		fmt.Printf("%s %d\n", s, countMatches(s, str));
+		fmt.Printf("%s %d\n", s, countMatches(s, bytes));
 	}
 	for i, sub := range substs {
-		str = compile(sub.pat).ReplaceAll(str, sub.repl);
+		bytes = compile(sub.pat).ReplaceAll(bytes, strings.Bytes(sub.repl));
 	}
-	fmt.Printf("\n%d\n%d\n%d\n", ilen, clen, len(str));
+	fmt.Printf("\n%d\n%d\n%d\n", ilen, clen, len(bytes));
 }