diff options
author | Andy Wingo <wingo@pobox.com> | 2023-11-15 10:18:37 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2023-11-15 10:44:21 +0100 |
commit | d08cc4f6e23f427b6d13fb63c27a5c8076533e85 (patch) | |
tree | 7a289d36536a7ba1bb67857e601f7556366c7805 /module/language | |
parent | 437e5ac43d89fbab902003dfce4e6982f350ffb5 (diff) | |
download | guile-d08cc4f6e23f427b6d13fb63c27a5c8076533e85.tar.gz |
Allow string->utf8 to constant-fold
* module/language/tree-il/primitives.scm (*interesting-primitive-names*):
(*primitive-accessors*): Add string->utf8, utf8->string, and
string-utf8-length.
(primitive-module): New public function, moved here from (language
tree-il compile-bytecode).
* module/language/tree-il/compile-bytecode.scm: Use primitive-module
from (language tree-il primitives).
* module/language/tree-il/peval.scm (peval): A bugfix: load primitives
from their proper module. Allows bytevector primitives to fold.
* module/language/cps/guile-vm/reify-primitives.scm:
* module/language/cps/effects-analysis.scm:
* module/language/cps/types.scm
* module/language/tree-il/primitives.scm:
* module/language/tree-il/cps-primitives.scm:
* module/language/tree-il/effects.scm (make-effects-analyzer):
Add string->utf8, utf8->string, and string-utf8-length.
* module/language/tree-il/compile-cps.scm (string->utf8)
(string-utf8-length, utf8->string): New custom lowerers, including type
checks and an unboxed result for string-utf8-length.
* module/system/vm/assembler.scm:
* libguile/intrinsics.h:
* libguile/intrinsics.c: Because string-utf8-length returns an unboxed
value, we need an intrinsic for it; go ahead and add an intrinsic for
string->utf8 and utf8->string too, as we will likely be able to use
these in the future.
Diffstat (limited to 'module/language')
-rw-r--r-- | module/language/cps/effects-analysis.scm | 5 | ||||
-rw-r--r-- | module/language/cps/guile-vm/reify-primitives.scm | 45 | ||||
-rw-r--r-- | module/language/cps/types.scm | 6 | ||||
-rw-r--r-- | module/language/tree-il/compile-bytecode.scm | 44 | ||||
-rw-r--r-- | module/language/tree-il/compile-cps.scm | 58 | ||||
-rw-r--r-- | module/language/tree-il/cps-primitives.scm | 3 | ||||
-rw-r--r-- | module/language/tree-il/effects.scm | 17 | ||||
-rw-r--r-- | module/language/tree-il/peval.scm | 3 | ||||
-rw-r--r-- | module/language/tree-il/primitives.scm | 53 |
9 files changed, 144 insertions, 90 deletions
diff --git a/module/language/cps/effects-analysis.scm b/module/language/cps/effects-analysis.scm index 69f0a51de..7b1e1d0ea 100644 --- a/module/language/cps/effects-analysis.scm +++ b/module/language/cps/effects-analysis.scm @@ -411,7 +411,10 @@ the LABELS that are clobbered by the effects of LABEL." ((symbol->string x)) ;; CPS lowering includes symbol? type check. ((symbol->keyword)) ;; Same. ((keyword->symbol)) ;; Same, for keyword?. - ((string->symbol) (&read-object &string) &type-check)) + ((string->symbol) (&read-object &string) &type-check) + ((string->utf8) (&read-object &string)) + ((utf8->string) (&read-object &bytevector) &type-check) + ((string-utf8-length) (&read-object &string))) ;; Threads. Calls cause &all-effects, which reflects the fact that any ;; call can capture a partial continuation and reinstate it on another diff --git a/module/language/cps/guile-vm/reify-primitives.scm b/module/language/cps/guile-vm/reify-primitives.scm index 871d12524..035a3266b 100644 --- a/module/language/cps/guile-vm/reify-primitives.scm +++ b/module/language/cps/guile-vm/reify-primitives.scm @@ -26,6 +26,8 @@ (define-module (language cps guile-vm reify-primitives) #:use-module (ice-9 match) + #:use-module ((language tree-il primitives) + #:select ((primitive-module . tree-il:primitive-module))) #:use-module (language cps) #:use-module (language cps utils) #:use-module (language cps with-cps) @@ -36,47 +38,7 @@ #:export (reify-primitives)) (define (primitive-module name) - (case name - ((bytevector? - bytevector-length - - bytevector-u8-ref bytevector-u8-set! - bytevector-s8-ref bytevector-s8-set! - - bytevector-u16-ref bytevector-u16-set! - bytevector-u16-native-ref bytevector-u16-native-set! - bytevector-s16-ref bytevector-s16-set! - bytevector-s16-native-ref bytevector-s16-native-set! - - bytevector-u32-ref bytevector-u32-set! - bytevector-u32-native-ref bytevector-u32-native-set! - bytevector-s32-ref bytevector-s32-set! - bytevector-s32-native-ref bytevector-s32-native-set! - - bytevector-u64-ref bytevector-u64-set! - bytevector-u64-native-ref bytevector-u64-native-set! - bytevector-s64-ref bytevector-s64-set! - bytevector-s64-native-ref bytevector-s64-native-set! - - bytevector-ieee-single-ref bytevector-ieee-single-set! - bytevector-ieee-single-native-ref bytevector-ieee-single-native-set! - bytevector-ieee-double-ref bytevector-ieee-double-set! - bytevector-ieee-double-native-ref bytevector-ieee-double-native-set!) - '(rnrs bytevectors)) - ((atomic-box? - make-atomic-box atomic-box-ref atomic-box-set! - atomic-box-swap! atomic-box-compare-and-swap!) - '(ice-9 atomic)) - ((current-thread) '(ice-9 threads)) - ((class-of) '(oop goops)) - ((u8vector-ref - u8vector-set! s8vector-ref s8vector-set! - u16vector-ref u16vector-set! s16vector-ref s16vector-set! - u32vector-ref u32vector-set! s32vector-ref s32vector-set! - u64vector-ref u64vector-set! s64vector-ref s64vector-set! - f32vector-ref f32vector-set! f64vector-ref f64vector-set!) - '(srfi srfi-4)) - (else '(guile)))) + (tree-il:primitive-module name)) (define (primitive-ref cps name k src) (with-cps cps @@ -338,6 +300,7 @@ string->symbol symbol->keyword symbol->string + string-utf8-length string->utf8 utf8->string class-of scm->f64 s64->u64 s64->scm scm->s64 diff --git a/module/language/cps/types.scm b/module/language/cps/types.scm index 858f08b2e..9816078d4 100644 --- a/module/language/cps/types.scm +++ b/module/language/cps/types.scm @@ -937,13 +937,15 @@ minimum, and maximum." ((symbol->keyword &symbol) &keyword) ((keyword->symbol &keyword) &symbol) ((symbol->string &symbol) &string) - ((string->symbol &string) &symbol)) + ((string->symbol &string) &symbol) + ((string-utf8-length &string) &u64) + ((utf8->string &bytevector) &string)) ;;; -;;; Threads. We don't currently track threads as an object type. +;;; We don't currently track threads as an object type. ;;; (define-simple-types diff --git a/module/language/tree-il/compile-bytecode.scm b/module/language/tree-il/compile-bytecode.scm index 2be2b1397..d98c40fe9 100644 --- a/module/language/tree-il/compile-bytecode.scm +++ b/module/language/tree-il/compile-bytecode.scm @@ -29,6 +29,7 @@ #:use-module (ice-9 match) #:use-module (language bytecode) #:use-module (language tree-il) + #:use-module ((language tree-il primitives) #:select (primitive-module)) #:use-module ((srfi srfi-1) #:select (filter-map fold lset-adjoin lset-union lset-difference)) @@ -348,49 +349,6 @@ (visit-immediate-tags define-immediate-type-predicate) (visit-heap-tags define-heap-type-predicate) -(define (primitive-module name) - (case name - ((bytevector? - bytevector-length - - bytevector-u8-ref bytevector-u8-set! - bytevector-s8-ref bytevector-s8-set! - - bytevector-u16-ref bytevector-u16-set! - bytevector-u16-native-ref bytevector-u16-native-set! - bytevector-s16-ref bytevector-s16-set! - bytevector-s16-native-ref bytevector-s16-native-set! - - bytevector-u32-ref bytevector-u32-set! - bytevector-u32-native-ref bytevector-u32-native-set! - bytevector-s32-ref bytevector-s32-set! - bytevector-s32-native-ref bytevector-s32-native-set! - - bytevector-u64-ref bytevector-u64-set! - bytevector-u64-native-ref bytevector-u64-native-set! - bytevector-s64-ref bytevector-s64-set! - bytevector-s64-native-ref bytevector-s64-native-set! - - bytevector-ieee-single-ref bytevector-ieee-single-set! - bytevector-ieee-single-native-ref bytevector-ieee-single-native-set! - bytevector-ieee-double-ref bytevector-ieee-double-set! - bytevector-ieee-double-native-ref bytevector-ieee-double-native-set!) - '(rnrs bytevectors)) - ((atomic-box? - make-atomic-box atomic-box-ref atomic-box-set! - atomic-box-swap! atomic-box-compare-and-swap!) - '(ice-9 atomic)) - ((current-thread) '(ice-9 threads)) - ((class-of) '(oop goops)) - ((u8vector-ref - u8vector-set! s8vector-ref s8vector-set! - u16vector-ref u16vector-set! s16vector-ref s16vector-set! - u32vector-ref u32vector-set! s32vector-ref s32vector-set! - u64vector-ref u64vector-set! s64vector-ref s64vector-set! - f32vector-ref f32vector-set! f64vector-ref f64vector-set!) - '(srfi srfi-4)) - (else '(guile)))) - (define (canonicalize exp) (define (reify-primref src name) ;; some are builtin-ref diff --git a/module/language/tree-il/compile-cps.scm b/module/language/tree-il/compile-cps.scm index 5c0fac579..052c9ec6f 100644 --- a/module/language/tree-il/compile-cps.scm +++ b/module/language/tree-il/compile-cps.scm @@ -408,6 +408,64 @@ (build-term ($branch knot-keyword kheap-object src 'heap-object? #f (kw)))))) +(define-primcall-converter string->utf8 + (lambda (cps k src op param str) + (define not-string + #(wrong-type-arg + "string->utf8" + "Wrong type argument in position 1 (expecting string): ~S")) + (with-cps cps + (letk knot-string + ($kargs () () ($throw src 'throw/value+data not-string (str)))) + (letk kstr + ($kargs () () + ($continue k src ($primcall 'string->utf8 #f (str))))) + (letk kheap-object + ($kargs () () + ($branch knot-string kstr src 'string? #f (str)))) + (build-term + ($branch knot-string kheap-object src 'heap-object? #f (str)))))) + +(define-primcall-converter string-utf8-length + (lambda (cps k src op param str) + (define not-string + #(wrong-type-arg + "string-utf8-length" + "Wrong type argument in position 1 (expecting string): ~S")) + (with-cps cps + (letv len) + (letk knot-string + ($kargs () () ($throw src 'throw/value+data not-string (str)))) + (letk ktag + ($kargs ('len) (len) + ($continue k src ($primcall 'u64->scm #f (len))))) + (letk kstr + ($kargs () () + ($continue ktag src ($primcall 'string-utf8-length #f (str))))) + (letk kheap-object + ($kargs () () + ($branch knot-string kstr src 'string? #f (str)))) + (build-term + ($branch knot-string kheap-object src 'heap-object? #f (str)))))) + +(define-primcall-converter utf8->string + (lambda (cps k src op param bv) + (define not-bv + #(wrong-type-arg + "utf8->string" + "Wrong type argument in position 1 (expecting bytevector): ~S")) + (with-cps cps + (letk knot-bv + ($kargs () () ($throw src 'throw/value+data not-bv (bv)))) + (letk kbv + ($kargs () () + ($continue k src ($primcall 'utf8->string #f (bv))))) + (letk kheap-object + ($kargs () () + ($branch knot-bv kbv src 'bytevector? #f (bv)))) + (build-term + ($branch knot-bv kheap-object src 'heap-object? #f (bv)))))) + (define (ensure-pair cps src op pred x is-pair) (define msg (match pred diff --git a/module/language/tree-il/cps-primitives.scm b/module/language/tree-il/cps-primitives.scm index f755d9474..5acb41857 100644 --- a/module/language/tree-il/cps-primitives.scm +++ b/module/language/tree-il/cps-primitives.scm @@ -131,6 +131,9 @@ (define-cps-primitive class-of 1 1) +(define-cps-primitive string-utf8-length 1 1) +(define-cps-primitive utf8->string 1 1) +(define-cps-primitive string->utf8 1 1) (define-cps-primitive (bytevector-length bv-length) 1 1) (define-cps-primitive (bytevector-u8-ref bv-u8-ref) 2 1) (define-cps-primitive (bytevector-u16-native-ref bv-u16-ref) 2 1) diff --git a/module/language/tree-il/effects.scm b/module/language/tree-il/effects.scm index f69f84165..a37a6d522 100644 --- a/module/language/tree-il/effects.scm +++ b/module/language/tree-il/effects.scm @@ -1,6 +1,6 @@ ;;; Effects analysis on Tree-IL -;; Copyright (C) 2011, 2012, 2013, 2021 Free Software Foundation, Inc. +;; Copyright (C) 2011, 2012, 2013, 2021, 2023 Free Software Foundation, Inc. ;;;; This library is free software; you can redistribute it and/or ;;;; modify it under the terms of the GNU Lesser General Public @@ -465,6 +465,21 @@ of an expression." (cause &type-check) (cause &string))) + (($ <primcall> _ 'string->utf8 (s)) + (logior (compute-effects s) + (cause &type-check) + (cause &allocation) + &string)) + (($ <primcall> _ 'string-utf8-length (s)) + (logior (compute-effects s) + (cause &type-check) + &string)) + (($ <primcall> _ 'utf8->string (bv)) + (logior (compute-effects bv) + (cause &type-check) + (cause &allocation) + &bytevector)) + (($ <primcall> _ (or 'bytevector-u8-ref 'bytevector-s8-ref 'bytevector-u16-ref 'bytevector-u16-native-ref diff --git a/module/language/tree-il/peval.scm b/module/language/tree-il/peval.scm index baf4f5847..05a2d7f05 100644 --- a/module/language/tree-il/peval.scm +++ b/module/language/tree-il/peval.scm @@ -581,9 +581,10 @@ top-level bindings from ENV and return the resulting expression." ;; todo: further optimize commutative primitives (catch #t (lambda () + (define mod (resolve-interface (primitive-module name))) (call-with-values (lambda () - (apply (module-ref the-scm-module name) args)) + (apply (module-ref mod name) args)) (lambda results (values #t results)))) (lambda _ diff --git a/module/language/tree-il/primitives.scm b/module/language/tree-il/primitives.scm index 3921f81d2..22a89063d 100644 --- a/module/language/tree-il/primitives.scm +++ b/module/language/tree-il/primitives.scm @@ -33,7 +33,8 @@ constructor-primitive? singly-valued-primitive? equality-primitive? bailout-primitive? - negate-primitive)) + negate-primitive + primitive-module)) ;; When adding to this, be sure to update *multiply-valued-primitives* ;; if appropriate. @@ -100,6 +101,8 @@ string-length string-ref string-set! + string->utf8 string-utf8-length utf8->string + make-struct/simple struct-vtable struct-ref struct-set! bytevector-length @@ -160,6 +163,7 @@ memq memv struct-ref string-ref + string->utf8 string-utf8-length utf8->string bytevector-u8-ref bytevector-s8-ref bytevector-u16-ref bytevector-u16-native-ref bytevector-s16-ref bytevector-s16-native-ref @@ -325,6 +329,53 @@ +(define (primitive-module name) + (case name + ((bytevector? + bytevector-length + + bytevector-u8-ref bytevector-u8-set! + bytevector-s8-ref bytevector-s8-set! + + bytevector-u16-ref bytevector-u16-set! + bytevector-u16-native-ref bytevector-u16-native-set! + bytevector-s16-ref bytevector-s16-set! + bytevector-s16-native-ref bytevector-s16-native-set! + + bytevector-u32-ref bytevector-u32-set! + bytevector-u32-native-ref bytevector-u32-native-set! + bytevector-s32-ref bytevector-s32-set! + bytevector-s32-native-ref bytevector-s32-native-set! + + bytevector-u64-ref bytevector-u64-set! + bytevector-u64-native-ref bytevector-u64-native-set! + bytevector-s64-ref bytevector-s64-set! + bytevector-s64-native-ref bytevector-s64-native-set! + + bytevector-ieee-single-ref bytevector-ieee-single-set! + bytevector-ieee-single-native-ref bytevector-ieee-single-native-set! + bytevector-ieee-double-ref bytevector-ieee-double-set! + bytevector-ieee-double-native-ref bytevector-ieee-double-native-set! + + string->utf8 utf8->string) + '(rnrs bytevectors)) + ((atomic-box? + make-atomic-box atomic-box-ref atomic-box-set! + atomic-box-swap! atomic-box-compare-and-swap!) + '(ice-9 atomic)) + ((current-thread) '(ice-9 threads)) + ((class-of) '(oop goops)) + ((u8vector-ref + u8vector-set! s8vector-ref s8vector-set! + u16vector-ref u16vector-set! s16vector-ref s16vector-set! + u32vector-ref u32vector-set! s32vector-ref s32vector-set! + u64vector-ref u64vector-set! s64vector-ref s64vector-set! + f32vector-ref f32vector-set! f64vector-ref f64vector-set!) + '(srfi srfi-4)) + (else '(guile)))) + + + (define *primitive-expand-table* (make-hash-table)) (define (expand-primcall x) |