From: Chris Hanson Date: Thu, 25 Jul 1991 02:40:58 +0000 (+0000) Subject: Install machine-dependent file and procedure to perform optimization X-Git-Tag: 20090517-FFI~10425 X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=dae1f86c761f67e817ade6c7e920392e3b380208;p=mit-scheme.git Install machine-dependent file and procedure to perform optimization of LAP between linearization and assembly. This is for instruction scheduling and peephole optimization. --- diff --git a/v7/src/compiler/base/toplev.scm b/v7/src/compiler/base/toplev.scm index 9f0c1dd9a..3f3dd73fe 100644 --- a/v7/src/compiler/base/toplev.scm +++ b/v7/src/compiler/base/toplev.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/base/toplev.scm,v 4.34 1991/05/06 22:45:45 jinx Exp $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/base/toplev.scm,v 4.35 1991/07/25 02:33:41 cph Exp $ Copyright (c) 1988-91 Massachusetts Institute of Technology @@ -1008,12 +1008,13 @@ MIT in each case. |# (compiler-phase "LAP Linearization" (lambda () (set! *lap* - (LAP ,@(if *procedure-result?* - (LAP (ENTRY-POINT ,*entry-label*)) - (lap:make-entry-point *entry-label* *block-label*)) - ,@(linearize-lap *rtl-root* - *rtl-procedures* - *rtl-continuations*))) + (optimize-linear-lap + (LAP ,@(if *procedure-result?* + (LAP (ENTRY-POINT ,*entry-label*)) + (lap:make-entry-point *entry-label* *block-label*)) + ,@(linearize-lap *rtl-root* + *rtl-procedures* + *rtl-continuations*)))) (with-values (lambda () (info-generation-phase-2 *rtl-expression* diff --git a/v7/src/compiler/machines/bobcat/compiler.pkg b/v7/src/compiler/machines/bobcat/compiler.pkg index a9bce563a..d7b9c3e8a 100644 --- a/v7/src/compiler/machines/bobcat/compiler.pkg +++ b/v7/src/compiler/machines/bobcat/compiler.pkg @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/bobcat/compiler.pkg,v 1.32 1991/05/06 23:09:24 jinx Exp $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/bobcat/compiler.pkg,v 1.33 1991/07/25 02:34:14 cph Exp $ Copyright (c) 1988-1991 Massachusetts Institute of Technology @@ -625,6 +625,12 @@ MIT in each case. |# (export (compiler top-level) linearize-lap)) +(define-package (compiler lap-optimizer) + (files "machines/bobcat/lapopt") + (parent (compiler)) + (export (compiler top-level) + optimize-linear-lap)) + (define-package (compiler assembler) (files "machines/bobcat/assmd" ;Machine dependent "back/symtab" ;Symbol tables diff --git a/v7/src/compiler/machines/bobcat/decls.scm b/v7/src/compiler/machines/bobcat/decls.scm index 5f5024267..0f79769b9 100644 --- a/v7/src/compiler/machines/bobcat/decls.scm +++ b/v7/src/compiler/machines/bobcat/decls.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/bobcat/decls.scm,v 4.27 1990/05/03 15:17:08 jinx Rel $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/bobcat/decls.scm,v 4.28 1991/07/25 02:34:19 cph Exp $ -Copyright (c) 1988, 1989, 1990 Massachusetts Institute of Technology +Copyright (c) 1988-91 Massachusetts Institute of Technology This material was developed by the Scheme project at the Massachusetts Institute of Technology, Department of Electrical Engineering and @@ -342,7 +342,8 @@ MIT in each case. |# "lapgn2" "lapgn3" "linear" "regmap" "symtab" "syntax") (filename/append "machines/bobcat" - "dassm1" "insmac" "machin" "rgspcm" "rulrew") + "dassm1" "insmac" "lapopt" "machin" "rgspcm" + "rulrew") (filename/append "fggen" "declar" "fggen" "canon") (filename/append "fgopt" diff --git a/v7/src/compiler/machines/bobcat/make.scm-68040 b/v7/src/compiler/machines/bobcat/make.scm-68040 index 8614fada3..5b2f83824 100644 --- a/v7/src/compiler/machines/bobcat/make.scm-68040 +++ b/v7/src/compiler/machines/bobcat/make.scm-68040 @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/bobcat/make.scm-68040,v 4.86 1991/06/12 20:54:31 cph Exp $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/bobcat/make.scm-68040,v 4.87 1991/07/25 02:34:28 cph Exp $ Copyright (c) 1988-91 Massachusetts Institute of Technology @@ -41,4 +41,4 @@ MIT in each case. |# ((package/reference (find-package name) 'INITIALIZE-PACKAGE!))) '((COMPILER MACROS) (COMPILER DECLARATIONS))) -(add-system! (make-system "Liar (Motorola MC68040)" 4 86 '())) \ No newline at end of file +(add-system! (make-system "Liar (Motorola MC68040)" 4 87 '())) \ No newline at end of file diff --git a/v7/src/compiler/machines/mips/compiler.pkg b/v7/src/compiler/machines/mips/compiler.pkg index dfd6871d4..3a27df536 100644 --- a/v7/src/compiler/machines/mips/compiler.pkg +++ b/v7/src/compiler/machines/mips/compiler.pkg @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/mips/compiler.pkg,v 1.3 1991/06/17 21:20:50 cph Exp $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/mips/compiler.pkg,v 1.4 1991/07/25 02:39:58 cph Exp $ $MC68020-Header: /scheme/compiler/bobcat/RCS/comp.pkg,v 1.32 1991/05/06 23:09:24 jinx Exp $ Copyright (c) 1988-91 Massachusetts Institute of Technology @@ -586,7 +586,7 @@ MIT in each case. |# "back/asmmac" ;Macros for hairy syntax "machines/mips/insmac" ;Macros for hairy syntax "machines/mips/inerly" ;Early binding version - "machines/mips/instr1" ;Mips instruction set + "machines/mips/instr1" ;MIPS instruction set "machines/mips/instr2a"; branch tensioning: branches "machines/mips/instr2b"; branch tensioning: load/store "machines/mips/instr3" ; floating point @@ -627,6 +627,12 @@ MIT in each case. |# bblock-linearize-lap) (export (compiler top-level) linearize-lap)) + +(define-package (compiler lap-optimizer) + (files "machines/mips/lapopt") + (parent (compiler)) + (export (compiler top-level) + optimize-linear-lap)) (define-package (compiler assembler) (files "machines/mips/assmd" ;Machine dependent diff --git a/v7/src/compiler/machines/mips/decls.scm b/v7/src/compiler/machines/mips/decls.scm index 4d9d11518..f551e60c9 100644 --- a/v7/src/compiler/machines/mips/decls.scm +++ b/v7/src/compiler/machines/mips/decls.scm @@ -1,9 +1,9 @@ #| -*-Scheme-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/mips/decls.scm,v 1.2 1990/07/22 20:18:06 jinx Rel $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/mips/decls.scm,v 1.3 1991/07/25 02:40:21 cph Exp $ $MC68020-Header: decls.scm,v 4.27 90/05/03 15:17:08 GMT jinx Exp $ -Copyright (c) 1988, 1989, 1990 Massachusetts Institute of Technology +Copyright (c) 1988-91 Massachusetts Institute of Technology This material was developed by the Scheme project at the Massachusetts Institute of Technology, Department of Electrical Engineering and @@ -343,7 +343,7 @@ MIT in each case. |# "lapgn2" "lapgn3" "linear" "regmap" "symtab" "syntax") (filename/append "machines/mips" - "dassm1" "insmac" "machin" "rgspcm" + "dassm1" "insmac" "lapopt" "machin" "rgspcm" "rulrew") (filename/append "fggen" "declar" "fggen" "canon") @@ -412,9 +412,7 @@ MIT in each case. |# (append (filename/append "back" "lapgn3" "regmap") (filename/append "machines/mips" "lapgen"))) (assembler-base - (append (filename/append "back" "symtab") - (filename/append "machines/mips" - "instr1" "instr2a" "instr2b" "instr3"))) + (filename/append "back" "symtab")) (lapgen-body (append (filename/append "back" "lapgn1" "lapgn2" "syntax") @@ -471,8 +469,6 @@ MIT in each case. |# (define-integration-dependencies "machines/mips" "machin" "rtlbase" "rtlreg" "rtlty1" "rtlty2") - (define-integration-dependencies "machines/mips" "instr1" "machines/mips" - "instr2a" "instr2b" "instr3") (define-integration-dependencies "rtlbase" "regset" "base") (define-integration-dependencies "rtlbase" "rgraph" "base" "cfg1" "cfg2") diff --git a/v7/src/compiler/machines/mips/make.scm-big b/v7/src/compiler/machines/mips/make.scm-big index 616424e9e..16a2d8703 100644 --- a/v7/src/compiler/machines/mips/make.scm-big +++ b/v7/src/compiler/machines/mips/make.scm-big @@ -1,7 +1,6 @@ #| -*-Scheme-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/mips/make.scm-big,v 4.86 1991/06/21 00:17:19 cph Exp $ -$MC68020-Header: /scheme/compiler/machines/bobcat/RCS/make.scm,v 4.86 1991/06/12 20:54:31 cph Exp $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/mips/make.scm-big,v 4.87 1991/07/25 02:40:47 cph Exp $ Copyright (c) 1988-91 Massachusetts Institute of Technology @@ -43,4 +42,4 @@ MIT in each case. |# '((COMPILER MACROS) (COMPILER DECLARATIONS))) (set! (access endianness (->environment '(COMPILER))) 'BIG) -(add-system! (make-system "Liar (MIPS)" 4 86 '())) \ No newline at end of file +(add-system! (make-system "Liar (MIPS)" 4 87 '())) \ No newline at end of file diff --git a/v7/src/compiler/machines/mips/make.scm-little b/v7/src/compiler/machines/mips/make.scm-little index 59363d3dc..8a128508c 100644 --- a/v7/src/compiler/machines/mips/make.scm-little +++ b/v7/src/compiler/machines/mips/make.scm-little @@ -1,7 +1,6 @@ #| -*-Scheme-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/mips/make.scm-little,v 4.86 1991/06/21 00:16:40 cph Exp $ -$MC68020-Header: /scheme/compiler/machines/bobcat/RCS/make.scm,v 4.86 1991/06/12 20:54:31 cph Exp $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/mips/make.scm-little,v 4.87 1991/07/25 02:40:58 cph Exp $ Copyright (c) 1988-91 Massachusetts Institute of Technology @@ -43,4 +42,4 @@ MIT in each case. |# '((COMPILER MACROS) (COMPILER DECLARATIONS))) (set! (access endianness (->environment '(COMPILER))) 'LITTLE) -(add-system! (make-system "Liar (MIPS)" 4 86 '())) \ No newline at end of file +(add-system! (make-system "Liar (MIPS)" 4 87 '())) \ No newline at end of file diff --git a/v7/src/compiler/machines/spectrum/compiler.pkg b/v7/src/compiler/machines/spectrum/compiler.pkg index dbd942135..ff0047478 100644 --- a/v7/src/compiler/machines/spectrum/compiler.pkg +++ b/v7/src/compiler/machines/spectrum/compiler.pkg @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/spectrum/compiler.pkg,v 1.31 1991/05/07 17:40:36 jinx Exp $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/spectrum/compiler.pkg,v 1.32 1991/07/25 02:35:14 cph Exp $ $MC68020-Header: /scheme/compiler/bobcat/RCS/comp.pkg,v 1.32 1991/05/06 23:09:24 jinx Exp $ Copyright (c) 1988-1991 Massachusetts Institute of Technology @@ -625,6 +625,12 @@ MIT in each case. |# (export (compiler top-level) linearize-lap)) +(define-package (compiler lap-optimizer) + (files "machines/spectrum/lapopt") + (parent (compiler)) + (export (compiler top-level) + optimize-linear-lap)) + (define-package (compiler assembler) (files "machines/spectrum/assmd" ;Machine dependent "back/symtab" ;Symbol tables diff --git a/v7/src/compiler/machines/spectrum/decls.scm b/v7/src/compiler/machines/spectrum/decls.scm index 34411a3fb..b2f12d231 100644 --- a/v7/src/compiler/machines/spectrum/decls.scm +++ b/v7/src/compiler/machines/spectrum/decls.scm @@ -1,9 +1,9 @@ #| -*-Scheme-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/spectrum/decls.scm,v 4.27 1990/07/22 18:53:17 jinx Rel $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/spectrum/decls.scm,v 4.28 1991/07/25 02:35:19 cph Exp $ $MC68020-Header: decls.scm,v 4.27 90/05/03 15:17:08 GMT jinx Exp $ -Copyright (c) 1988, 1989, 1990 Massachusetts Institute of Technology +Copyright (c) 1988-91 Massachusetts Institute of Technology This material was developed by the Scheme project at the Massachusetts Institute of Technology, Department of Electrical Engineering and @@ -342,7 +342,8 @@ MIT in each case. |# "lapgn2" "lapgn3" "linear" "regmap" "symtab" "syntax") (filename/append "machines/spectrum" - "dassm1" "insmac" "machin" "rgspcm" "rulrew") + "dassm1" "insmac" "lapopt" "machin" "rgspcm" + "rulrew") (filename/append "fggen" "declar" "fggen" "canon") (filename/append "fgopt" diff --git a/v7/src/compiler/machines/spectrum/make.scm b/v7/src/compiler/machines/spectrum/make.scm index e6e13af87..22532f04f 100644 --- a/v7/src/compiler/machines/spectrum/make.scm +++ b/v7/src/compiler/machines/spectrum/make.scm @@ -1,7 +1,6 @@ #| -*-Scheme-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/spectrum/make.scm,v 4.84 1991/05/07 17:41:31 jinx Exp $ -$MC68020-Header: /scheme/compiler/bobcat/RCS/make.scm,v 4.84 1991/05/07 13:47:44 jinx Exp $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/spectrum/make.scm,v 4.87 1991/07/25 02:38:17 cph Exp $ Copyright (c) 1988-91 Massachusetts Institute of Technology @@ -42,4 +41,4 @@ MIT in each case. |# ((package/reference (find-package name) 'INITIALIZE-PACKAGE!))) '((COMPILER MACROS) (COMPILER DECLARATIONS))) -(add-system! (make-system "Liar (HP PA)" 4 84 '())) \ No newline at end of file +(add-system! (make-system "Liar (HP PA)" 4 87 '())) \ No newline at end of file diff --git a/v7/src/compiler/machines/vax/compiler.pkg b/v7/src/compiler/machines/vax/compiler.pkg index 0cb526954..5499dd15d 100644 --- a/v7/src/compiler/machines/vax/compiler.pkg +++ b/v7/src/compiler/machines/vax/compiler.pkg @@ -1,9 +1,9 @@ #| -*-Scheme-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/vax/compiler.pkg,v 1.6 1991/02/15 00:41:07 jinx Exp $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/vax/compiler.pkg,v 1.7 1991/07/25 02:38:44 cph Exp $ $MC68020-Header: comp.pkg,v 1.30 90/05/03 15:16:59 GMT jinx Exp $ -Copyright (c) 1988, 1989, 1991 Massachusetts Institute of Technology +Copyright (c) 1988-91 Massachusetts Institute of Technology This material was developed by the Scheme project at the Massachusetts Institute of Technology, Department of Electrical Engineering and @@ -620,6 +620,12 @@ MIT in each case. |# (export (compiler top-level) linearize-lap)) +(define-package (compiler lap-optimizer) + (files "machines/vax/lapopt") + (parent (compiler)) + (export (compiler top-level) + optimize-linear-lap)) + (define-package (compiler assembler) (files "machines/vax/assmd" ;Machine dependent "back/symtab" ;Symbol tables diff --git a/v7/src/compiler/machines/vax/decls.scm b/v7/src/compiler/machines/vax/decls.scm index 0121d79d4..e23717bec 100644 --- a/v7/src/compiler/machines/vax/decls.scm +++ b/v7/src/compiler/machines/vax/decls.scm @@ -1,9 +1,9 @@ #| -*-Scheme-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/vax/decls.scm,v 4.5 1991/02/15 00:41:29 jinx Exp $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/vax/decls.scm,v 4.6 1991/07/25 02:38:48 cph Exp $ $MC68020-Header: decls.scm,v 4.27 90/05/03 15:17:08 GMT jinx Exp $ -Copyright (c) 1987, 1989, 1991 Massachusetts Institute of Technology +Copyright (c) 1987-91 Massachusetts Institute of Technology This material was developed by the Scheme project at the Massachusetts Institute of Technology, Department of Electrical Engineering and @@ -343,8 +343,8 @@ MIT in each case. |# "lapgn2" "lapgn3" "linear" "regmap" "symtab" "syntax") (filename/append "machines/vax" - "dassm1" "dsyn" "insmac" "machin" "rgspcm" - "rulrew") + "dassm1" "dsyn" "insmac" "lapopt" "machin" + "rgspcm" "rulrew") (filename/append "fggen" "declar" "fggen" "canon") (filename/append "fgopt"