Commit: 760c2afb3a71d7855552fd8472af14402510c3cc - cammy (git)

A categorical programming language

Commit MetaInfo

• Revisión: 760c2afb3a71d7855552fd8472af14402510c3cc (tree)
• Tiempo: 2021-10-26 05:46:26
• Autor: Corbin <cds@corb...>
• Commiter: Corbin

Log Message

cammy-run: JIT-compile per-pixel drawings.

Cambiar Resumen

• modified: cammy-run/default.nix
• modified: cammy-run/main.py
• modified: shell.nix

Diferencia incremental

--- a/cammy-run/default.nix
+++ b/cammy-run/default.nix
@@ -1,7 +1,8 @@
 { nixpkgs ? import <nixpkgs> {} }:
 let
   inherit (nixpkgs.pkgs)
-  fetchFromGitLab stdenv pypy pypyPackages pkg-config stb;
+  fetchFromGitLab stdenv
+  pypy pypyPackages pkg-config libffi stb;
   # https://foss.heptapod.net/pypy/pypy/
   pypySrc = fetchFromGitLab {
     domain = "foss.heptapod.net";
@@ -17,7 +18,11 @@ stdenv.mkDerivation {
 
   src = ./.;
 
-  buildInputs = [ pypy pypyPackages.py pypySrc pkg-config stb ];
+  buildInputs = [
+    # always required
+    pypy pypyPackages.py pypySrc pkg-config stb
+    # only required for JIT
+    pypyPackages.pytest libffi ];
 
   buildPhase = ''
     source $stdenv/setup
@@ -25,7 +30,7 @@ stdenv.mkDerivation {
     cp -r ${pypySrc}/rpython .
     chmod -R u+w rpython/
     # Do the actual translation.
-    ${pypy}/bin/pypy -mrpython -O2 main.py
+    ${pypy}/bin/pypy -mrpython -Ojit main.py
     '';
 
   installPhase = ''

--- a/cammy-run/main.py
+++ b/cammy-run/main.py
@@ -1,5 +1,16 @@
+# Monkey-patch the stdlib. Borrowed from Typhon.
+from ctypes import util
+fl = util.find_library
+def patched_find_library(name):
+    if name == "c":
+        return "libc.so.6"
+    else:
+        return fl(name)
+util.find_library = patched_find_library
+
 import math, sys
 
+from rpython.rlib.jit import JitDriver, set_param
 from rpython.rlib.parsing.main import make_parser_from_file
 from rpython.rlib.parsing.tree import RPythonVisitor
 from rpython.rlib.rfile import create_stdio
@@ -342,30 +353,55 @@ def scale(bot, top, x):
 def finishChannel(c):
     return int(255 * max(0.0, min(1.0, c)))
 
-def drawPNG(program, filename, window, width, height):
-    pixelRadius = 0.000001
-    size = width * height
-    iw = 1.0 / width
-    dw = 0.5 * iw
-    ih = 1.0 / height
-    dh = 0.5 * ih
-    channels = 3
+class Window(object):
+    _immutable_ = True
+
+    def __init__(self, corners, width, height):
+        self._corners = corners[0], corners[1], corners[2], corners[3]
+        self._w = width
+        self._h = height
+
+    def coordsForPixel(self, i):
+        w = i % self._w
+        h = i // self._w
+        iw = 1.0 / self._w
+        dw = 0.5 * iw
+        ih = 1.0 / self._h
+        dh = 0.5 * ih
+        c1 = scale(self._corners[0], self._corners[2], dw + iw * w)
+        c2 = scale(self._corners[1], self._corners[3], dh + ih * h)
+        return c1, c2
+
+driver = JitDriver(greens=["size", "program", "window"],
+        reds=["pixel", "stringbuilder"])
+
+def drawPixels(size, program, window):
     sb = StringBuilder()
-    for i in range(size):
-        w = i % width
-        h = i // width
-        c1 = scale(window[0], window[2], dw + iw * w)
-        c2 = scale(window[0], window[2], dh + ih * h)
+    i = 0
+    while i < size:
+        driver.jit_merge_point(size=size, program=program, window=window,
+                pixel=i, stringbuilder=sb)
+        c1, c2 = window.coordsForPixel(i)
         rgb = program.run(P(F(c1), F(c2)))
         r = finishChannel(rgb.first().f())
         g = finishChannel(rgb.second().first().f())
         b = finishChannel(rgb.second().second().f())
         sb.append(chr(r) + chr(g) + chr(b))
-    buf = sb.build()
+        i += 1
+    return sb.build()
+
+def drawPNG(program, filename, corners, width, height):
+    pixelRadius = 0.000001
+    window = Window(corners, width, height)
+    size = width * height
+    buf = drawPixels(size, program, window)
+    channels = 3
     stb.i_write_png(filename, width, height, channels, buf, width * channels)
 
 
 def main(argv):
+    set_param(driver, "trace_limit", 50001)
+
     prog = argv[1]
     window = [string_to_float(s) for s in split(argv[2])]
     width = int(argv[3])

--- a/shell.nix
+++ b/shell.nix
@@ -25,5 +25,7 @@ in pkgs.stdenv.mkDerivation {
     keychain mktorrent
     # experimenting with GLSL
     mesa-demos
+    # comparing prototypes
+    sloccount
   ];
 }