Let wuffs-c take a no-op C formatter

Reinforcing the previous commit's (e5cc4a42) observation, over 93% of
compilation time (converting foo.wuffs into foo.c) is spent piping the
generated C code through clang-format.

----
$ time wuffs gen -cformatter=clang-format-5.0 > /dev/null
real	0m2.855s
user	0m2.680s
sys	0m0.286s

$ time wuffs gen -cformatter=                 > /dev/null
real	0m0.175s
user	0m0.172s
sys	0m0.050s
----
This commit is contained in:
Nigel Tao committed 2020-06-03 13:21:53 +10:00
1 parent e5cc4a42e4
commit ddc8973ef0
5 files changed
+17 -5

No files matched your search

+5
View File
@@ -137,6 +137,11 @@ func doGenrelease(args []string) error {
now = time.Now()
}
if *cformatterFlag == "" {
os.Stdout.Write(unformatted.Bytes())
return nil
}
cmd := exec.Command(*cformatterFlag, "-style=Chromium")
cmd.Stdin = unformatted
cmd.Stdout = os.Stdout
+1 -1
View File
@@ -110,7 +110,7 @@ func doGenGenlib(wuffsRoot string, args []string, genlib bool) error {
if genlib {
return h.genlibAffected()
}
return genrelease(wuffsRoot, langs, v)
return genrelease(wuffsRoot, langs, v, *cformatterFlag)
}
type genHelper struct {
+6 -3
View File
@@ -24,13 +24,13 @@ import (
cf "github.com/google/wuffs/cmd/commonflags"
)
func genrelease(wuffsRoot string, langs []string, v cf.Version) error {
func genrelease(wuffsRoot string, langs []string, v cf.Version, cformatter string) error {
revision := runGitCommand(wuffsRoot, "rev-parse", "HEAD")
commitDate := runGitCommand(wuffsRoot, "show",
"--quiet", "--date=format-local:%Y-%m-%d", "--format=%cd")
gitRevListCount := runGitCommand(wuffsRoot, "rev-list", "--count", "HEAD")
for _, lang := range langs {
filename, contents, err := genreleaseLang(wuffsRoot, revision, commitDate, gitRevListCount, v, lang)
filename, contents, err := genreleaseLang(wuffsRoot, revision, commitDate, gitRevListCount, v, cformatter, lang)
if err != nil {
return err
}
@@ -41,7 +41,7 @@ func genrelease(wuffsRoot string, langs []string, v cf.Version) error {
return nil
}
func genreleaseLang(wuffsRoot string, revision string, commitDate, gitRevListCount string, v cf.Version, lang string) (filename string, contents []byte, err error) {
func genreleaseLang(wuffsRoot string, revision string, commitDate, gitRevListCount string, v cf.Version, cformatter string, lang string) (filename string, contents []byte, err error) {
qualFilenames, err := findFiles(filepath.Join(wuffsRoot, "gen", lang), "."+lang)
if err != nil {
return "", nil, err
@@ -57,6 +57,9 @@ func genreleaseLang(wuffsRoot string, revision string, commitDate, gitRevListCou
if gitRevListCount != "" {
args = append(args, "-gitrevlistcount", gitRevListCount)
}
if lang == "c" {
args = append(args, "-cformatter", cformatter)
}
args = append(args, qualFilenames...)
stdout := &bytes.Buffer{}
+1 -1
View File
@@ -116,7 +116,7 @@ func doBenchTest(wuffsRoot string, args []string, bench bool) error {
return err
}
}
if err := genrelease(wuffsRoot, langs, cf.Version{}); err != nil {
if err := genrelease(wuffsRoot, langs, cf.Version{}, *cformatterFlag); err != nil {
return err
}
}
+4
View File
@@ -194,6 +194,10 @@ func Do(args []string) error {
now = time.Now()
}
if *cformatterFlag == "" {
return unformatted, nil
}
stdout := &bytes.Buffer{}
cmd := exec.Command(*cformatterFlag, "-style=Chromium")
cmd.Stdin = bytes.NewReader(unformatted)