Merge multiple puffs-xxx-c binaries into one.

This commit is contained in:
Nigel Tao committed 2017-08-24 09:43:57 +10:00
1 parent 7ccefa1b40
commit fdddcc8e1d
16 files changed
+113 -93

No files matched your search

@@ -1,7 +1,6 @@
// Use of this source code is governed by a BSD-style license that can be found
// in the LICENSE file.
// puffs-genlib-c builds C software libraries.
package main
import (
@@ -13,27 +12,21 @@ import (
"strings"
)
var (
dstdirFlag = flag.String("dstdir", "", "directory containing the object files ")
srcdirFlag = flag.String("srcdir", "", "directory containing the C source files")
)
func main() {
if err := main1(); err != nil {
os.Stderr.WriteString(err.Error() + "\n")
os.Exit(1)
func doGenlib(args []string) error {
flags := flag.FlagSet{}
dstdirFlag := flags.String("dstdir", "", "directory containing the object files ")
srcdirFlag := flags.String("srcdir", "", "directory containing the C source files")
if err := flags.Parse(args); err != nil {
return err
}
}
args = flags.Args()
func main1() error {
flag.Parse()
if *dstdirFlag == "" {
return fmt.Errorf("empty -dstdir flag")
}
if *srcdirFlag == "" {
return fmt.Errorf("empty -srcdir flag")
}
args := flag.Args()
for _, cc := range []string{"clang", "gcc"} {
for _, dynamism := range []string{"static", "dynamic"} {
@@ -41,7 +34,7 @@ func main1() error {
if err := os.MkdirAll(outDir, 0755); err != nil {
return err
}
if err := genObj(outDir, cc, dynamism, args); err != nil {
if err := genObj(outDir, *srcdirFlag, cc, dynamism, args); err != nil {
return err
}
if err := genLib(outDir, cc, dynamism, args); err != nil {
@@ -64,10 +57,10 @@ var (
}
)
func genObj(outDir string, cc string, dynamism string, filenames []string) error {
func genObj(outDir string, inDir string, cc string, dynamism string, filenames []string) error {
for _, filename := range filenames {
in := filepath.Join(*srcdirFlag, filename+".c")
out := outFilename(outDir, dynamism, filename)
in := filepath.Join(inDir, filename+".c")
out := genlibOutFilename(outDir, dynamism, filename)
args := []string(nil)
args = append(args, "-O3", "-std=c99")
@@ -101,7 +94,7 @@ func genLib(outDir string, cc string, dynamism string, filenames []string) error
args = append(args, out)
for _, filename := range filenames {
args = append(args, outFilename(outDir, dynamism, filename))
args = append(args, genlibOutFilename(outDir, dynamism, filename))
}
cmd := exec.Command(cc, args...)
@@ -114,7 +107,7 @@ func genLib(outDir string, cc string, dynamism string, filenames []string) error
return nil
}
func outFilename(outDir string, dynamism string, filename string) string {
func genlibOutFilename(outDir string, dynamism string, filename string) string {
filename = strings.Replace(filename, "/", "-", -1)
filename = strings.Replace(filename, "\\", "-", -1)
filename = filepath.Join(outDir, filename+objExtensions[dynamism])
File renamed without changes.
File renamed without changes.
@@ -3,13 +3,7 @@
//go:generate go run gen.go
// puffs-gen-c transpiles a Puffs program to a C program.
//
// The command line arguments list the source Puffs files. If no arguments are
// given, it reads from stdin.
//
// The generated program is written to stdout.
package main
package cgen
import (
"bytes"
@@ -44,8 +38,14 @@ const (
vPrefix = "v_" // Local variable.
)
func main() {
generate.Main(func(pkgName string, tm *t.Map, c *check.Checker, files []*a.File) ([]byte, error) {
// Do transpiles a Puffs program to a C program.
//
// The arguments list the source Puffs files. If no arguments are given, it
// reads from stdin.
//
// The generated program is written to stdout.
func Do(args []string) error {
return generate.Do(args, func(pkgName string, tm *t.Map, c *check.Checker, files []*a.File) ([]byte, error) {
g := &gen{
PKGPREFIX: "PUFFS_" + strings.ToUpper(pkgName) + "_",
pkgPrefix: "puffs_" + pkgName + "_",
@@ -213,7 +213,7 @@ func (g *gen) genHeader() error {
includeGuard := "PUFFS_" + strings.ToUpper(g.pkgName) + "_H"
g.printf("#ifndef %s\n#define %s\n\n", includeGuard, includeGuard)
g.printf("// Code generated by puffs-gen-c. DO NOT EDIT.\n\n")
g.printf("// Code generated by puffs-c. DO NOT EDIT.\n\n")
g.writes(baseHeader)
g.writes("\n#ifdef __cplusplus\nextern \"C\" {\n#endif\n\n")
@@ -3,7 +3,7 @@
// Use of this source code is governed by a BSD-style license that can be found
// in the LICENSE file.
package main
package cgen
const baseHeader = "" +
"#ifndef PUFFS_BASE_HEADER_H\n#define PUFFS_BASE_HEADER_H\n\n// Use of this source code is governed by a BSD-style license that can be found\n// in the LICENSE file.\n\n#include <stdbool.h>\n#include <stdint.h>\n#include <string.h>\n\n// Puffs requires a word size of at least 32 bits because it assumes that\n// converting a u32 to usize will never overflow. For example, the size of a\n// decoded image is often represented, explicitly or implicitly in an image\n// file, as a u32, and it is convenient to compare that to a buffer size.\n//\n// Similarly, the word size is at most 64 bits because it assumes that\n// converting a usize to u64 will never overflow.\n#if __WORDSIZE < 32\n#error \"Puffs requires a word size of at least 32 bits\"\n#elif __WORDSIZE > 64\n#error \"Puffs requires a word size of at most 64 bits\"\n#endif\n\n// PUFFS_VERSION is the major.minor version number as a uint32. The major\n// number is the high 16 bits. The minor number is the low 16 bits.\n//\n// The intention is to bump the version number at least on every API " +
@@ -1,7 +1,7 @@
// Use of this source code is governed by a BSD-style license that can be found
// in the LICENSE file.
package main
package cgen
import (
"errors"
@@ -40,7 +40,7 @@ func main1() error {
out.WriteString("// Use of this source code is governed by a BSD-style license that can be found\n")
out.WriteString("// in the LICENSE file.\n")
out.WriteString("\n")
out.WriteString("package main\n")
out.WriteString("package cgen\n")
out.WriteString("\n")
for _, f := range files {
+37
View File
@@ -0,0 +1,37 @@
// Use of this source code is governed by a BSD-style license that can be found
// in the LICENSE file.
// puffs-c handles the C language specific parts of the puffs tool.
package main
import (
"fmt"
"os"
"github.com/google/puffs/cmd/puffs-c/internal/cgen"
)
func main() {
if err := main1(); err != nil {
os.Stderr.WriteString(err.Error() + "\n")
os.Exit(1)
}
}
func main1() error {
if len(os.Args) < 2 {
return fmt.Errorf("no sub-command given")
}
args := os.Args[2:]
switch os.Args[1] {
case "bench":
return doBench(args)
case "gen":
return cgen.Do(args)
case "genlib":
return doGenlib(args)
case "test":
return doTest(args)
}
return fmt.Errorf("bad sub-command %q", os.Args[1])
}
@@ -1,7 +1,6 @@
// Use of this source code is governed by a BSD-style license that can be found
// in the LICENSE file.
// puffs-test-c runs C benchmark and test programs.
package main
import (
@@ -15,38 +14,35 @@ import (
"strings"
)
const (
mimicDefault = false
mimicUsage = `whether to compare Puffs' output with other libraries' output`
func doBench(args []string) error { return doBenchTest(args, true) }
func doTest(args []string) error { return doBenchTest(args, false) }
repsDefault = 5
repsMin = 0
repsMax = 1000000
repsUsage = `the number of repetitions per benchmark`
)
func doBenchTest(args []string, bench bool) error {
const (
mimicDefault = false
mimicUsage = `whether to compare Puffs' output with other libraries' output`
var (
benchFlag = flag.Bool("bench", false, "whether to run benchmarks instead of regular tests")
mimicFlag = flag.Bool("mimic", mimicDefault, mimicUsage)
repsFlag = flag.Int("reps", repsDefault, repsUsage)
)
repsDefault = 5
repsMin = 0
repsMax = 1000000
repsUsage = `the number of repetitions per benchmark`
)
func main() {
if err := main1(); err != nil {
os.Stderr.WriteString(err.Error() + "\n")
os.Exit(1)
flags := flag.FlagSet{}
mimicFlag := flags.Bool("mimic", mimicDefault, mimicUsage)
repsFlag := flags.Int("reps", repsDefault, repsUsage)
if err := flags.Parse(args); err != nil {
return err
}
}
args = flags.Args()
func main1() error {
flag.Parse()
if *repsFlag < repsMin || repsMax < *repsFlag {
return fmt.Errorf("bad -reps flag value %d, outside the range [%d..%d]", *repsFlag, repsMin, repsMax)
}
failed := false
for _, arg := range flag.Args() {
f, err := do(arg)
for _, arg := range args {
f, err := doBenchTest1(arg, bench, *mimicFlag, *repsFlag)
if err != nil {
return err
}
@@ -54,7 +50,7 @@ func main1() error {
}
if failed {
s := "tests"
if *benchFlag {
if bench {
s = "benchmarks"
}
return fmt.Errorf("%s: some %s failed", os.Args[0], s)
@@ -62,8 +58,8 @@ func main1() error {
return nil
}
func do(filename string) (failed bool, err error) {
workDir, err := ioutil.TempDir("", "puffs-test-c")
func doBenchTest1(filename string, bench bool, mimic bool, reps int) (failed bool, err error) {
workDir, err := ioutil.TempDir("", "puffs-c")
if err != nil {
return false, err
}
@@ -73,14 +69,14 @@ func do(filename string) (failed bool, err error) {
out := filepath.Join(workDir, "a.out")
ccArgs := []string(nil)
if *benchFlag {
if bench {
ccArgs = append(ccArgs, "-O3")
} else {
// TODO: set these flags even if we pass -O3.
ccArgs = append(ccArgs, "-Wall", "-Werror")
}
ccArgs = append(ccArgs, "-std=c99", "-o", out, in)
if *mimicFlag {
if mimic {
extra, err := findPuffsMimicCflags(in)
if err != nil {
return false, err
@@ -97,8 +93,8 @@ func do(filename string) (failed bool, err error) {
}
outArgs := []string(nil)
if *benchFlag {
outArgs = append(outArgs, "-bench", fmt.Sprintf("-reps=%d", *repsFlag))
if bench {
outArgs = append(outArgs, "-bench", fmt.Sprintf("-reps=%d", reps))
}
outCmd := exec.Command(out, outArgs...)
outCmd.Stdout = os.Stdout
+4 -4
View File
@@ -120,9 +120,9 @@ func genDir(puffsRoot string, dirname string, filenames []string, langs []string
}
for _, lang := range langs {
command := "puffs-gen-" + lang
command := "puffs-" + lang
stdout := &bytes.Buffer{}
cmd := exec.Command(command, "-package_name", packageName)
cmd := exec.Command(command, "gen", "-package_name", packageName)
cmd.Stdin = bytes.NewReader(combinedSrc)
cmd.Stdout = stdout
cmd.Stderr = os.Stderr
@@ -174,8 +174,8 @@ func genFile(puffsRoot string, dirname string, lang string, out []byte) error {
func genlibAffected(puffsRoot string, langs []string, affected []string) error {
for _, lang := range langs {
command := "puffs-genlib-" + lang
args := []string(nil)
command := "puffs-" + lang
args := []string{"genlib"}
args = append(args, "-dstdir", filepath.Join(puffsRoot, "gen", "lib", lang))
args = append(args, "-srcdir", filepath.Join(puffsRoot, "gen", lang))
args = append(args, affected...)
+6 -4
View File
@@ -36,12 +36,14 @@ func doBenchTest(puffsRoot string, args []string, bench bool) error {
}
cmdArgs := []string(nil)
if bench {
cmdArgs = append(cmdArgs, "bench", fmt.Sprintf("-reps=%d", *repsFlag))
} else {
cmdArgs = append(cmdArgs, "test")
}
if *mimicFlag {
cmdArgs = append(cmdArgs, "-mimic")
}
if bench {
cmdArgs = append(cmdArgs, "-bench", fmt.Sprintf("-reps=%d", *repsFlag))
}
failed := false
for _, arg := range args {
@@ -102,7 +104,7 @@ func benchTestDir(puffsRoot string, dirname string, langs []string, cmdArgs []st
}
for _, lang := range langs {
command := "puffs-test-" + lang
command := "puffs-" + lang
args := []string(nil)
args = append(args, cmdArgs...)
args = append(args, filepath.Join(puffsRoot, "test", lang, filepath.FromSlash(dirname)))
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef PUFFS_FLATE_H
#define PUFFS_FLATE_H
// Code generated by puffs-gen-c. DO NOT EDIT.
// Code generated by puffs-c. DO NOT EDIT.
#ifndef PUFFS_BASE_HEADER_H
#define PUFFS_BASE_HEADER_H
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef PUFFS_GIF_H
#define PUFFS_GIF_H
// Code generated by puffs-gen-c. DO NOT EDIT.
// Code generated by puffs-c. DO NOT EDIT.
#ifndef PUFFS_BASE_HEADER_H
#define PUFFS_BASE_HEADER_H
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef PUFFS_FLATE_H
#define PUFFS_FLATE_H
// Code generated by puffs-gen-c. DO NOT EDIT.
// Code generated by puffs-c. DO NOT EDIT.
#ifndef PUFFS_BASE_HEADER_H
#define PUFFS_BASE_HEADER_H
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef PUFFS_GIF_H
#define PUFFS_GIF_H
// Code generated by puffs-gen-c. DO NOT EDIT.
// Code generated by puffs-c. DO NOT EDIT.
#ifndef PUFFS_BASE_HEADER_H
#define PUFFS_BASE_HEADER_H
+10 -18
View File
@@ -7,7 +7,6 @@ import (
"flag"
"io/ioutil"
"os"
"os/exec"
"github.com/google/puffs/lang/ast"
"github.com/google/puffs/lang/check"
@@ -15,25 +14,18 @@ import (
"github.com/google/puffs/lang/token"
)
var (
packageName = flag.String("package_name", "", "the package name of the Puffs input code")
)
type Generator func(packageName string, tm *token.Map, c *check.Checker, files []*ast.File) ([]byte, error)
func Main(g Generator) {
if err := main1(g); err != nil {
if _, ok := err.(*exec.ExitError); !ok {
os.Stderr.WriteString(err.Error() + "\n")
}
os.Exit(1)
func Do(args []string, g Generator) error {
flags := flag.FlagSet{}
packageName := flags.String("package_name", "", "the package name of the Puffs input code")
if err := flags.Parse(args); err != nil {
return err
}
}
args = flags.Args()
func main1(g Generator) error {
flag.Parse()
tm := &token.Map{}
files, err := parseFiles(tm)
files, err := parseFiles(tm, args)
if err != nil {
return err
}
@@ -54,8 +46,8 @@ func main1(g Generator) error {
return nil
}
func parseFiles(tm *token.Map) (files []*ast.File, err error) {
if len(flag.Args()) == 0 {
func parseFiles(tm *token.Map, args []string) (files []*ast.File, err error) {
if len(args) == 0 {
const filename = "stdin"
src, err := ioutil.ReadAll(os.Stdin)
if err != nil {
@@ -72,7 +64,7 @@ func parseFiles(tm *token.Map) (files []*ast.File, err error) {
return []*ast.File{f}, nil
}
for _, filename := range flag.Args() {
for _, filename := range args {
src, err := ioutil.ReadFile(filename)
if err != nil {
return nil, err