Merge pull request #566 from boriel/feature/optimize_mul8_and_mul16_for_zxnext

feat: add optimization for mul8 in zxnext

Author: boriel

src/arch/z80/peephole/engine.py

@@ -146,15 +146,15 @@ def init():
     PATTERNS.clear()
 
 
-def main(list_of_directories: Optional[List[str]] = None):
+def main(list_of_directories: Optional[List[str]] = None, force: bool = False):
     """Initializes the module and load all the *.opt files
     containing patterns and parses them. Valid .opt files will be stored in
     PATTERNS
     """
     global PATTERNS
     global MAXLEN
 
-    if MAXLEN:  # If already loaded, don't reload (cache)
+    if not force and MAXLEN:  # If already loaded, don't reload (cache)
         return
 
     init()

src/arch/zxnext/backend/__init__.py

@@ -1,9 +1,14 @@
 # -*- coding: utf-8 -*-
 
-from src.api.config import OPTIONS
-from src.arch.z80 import backend
+from src.api.config import OPTIONS, Action
+from src.arch.z80.backend.runtime.namespace import NAMESPACE
+
+from src.arch.z80.backend import common
+from src.arch.z80.backend import engine
 from src.arch.z80.backend import ICInfo
 
+from src.arch.zxnext.peephole import OPTS_PATH
+
 from src.arch.zxnext.backend._8bit import _mul8
 
 from src.arch.z80.backend import tmp_label, _fpop, HI16, INITS, LO16, LABEL_COUNTER, MEMORY, MEMINITS
@@ -41,5 +46,19 @@
 def init():
     # ZXNext asm enabled by default for this arch
     OPTIONS.zxnext = True
+    """Initializes this module"""
+
+    common.init()
+
+    # Default code ORG
+    OPTIONS(Action.ADD_IF_NOT_DEFINED, name="org", type=int, default=32768)
+    # Default HEAP SIZE (Dynamic memory) in bytes
+    OPTIONS(Action.ADD_IF_NOT_DEFINED, name="heap_size", type=int, default=4768, ignore_none=True)  # A bit more than 4K
+    # Labels for HEAP START (might not be used if not needed)
+    OPTIONS(Action.ADD_IF_NOT_DEFINED, name="heap_start_label", type=str, default=f"{NAMESPACE}.ZXBASIC_MEM_HEAP")
+    # Labels for HEAP SIZE (might not be used if not needed)
+    OPTIONS(Action.ADD_IF_NOT_DEFINED, name="heap_size_label", type=str, default=f"{NAMESPACE}.ZXBASIC_HEAP_SIZE")
+    # Flag for headerless mode (No prologue / epilogue)
+    OPTIONS(Action.ADD_IF_NOT_DEFINED, name="headerless", type=bool, default=False, ignore_none=True)
 
-    backend.init()
+    engine.main([engine.OPTS_PATH, OPTS_PATH], force=True)  # inits the optimizer

src/arch/zxnext/peephole/__init__.py

@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+
+import os
+
+# Optimization recipes paths for this arch
+OPTS_PATH = os.path.join(os.path.dirname(__file__), "opts")

src/arch/zxnext/peephole/opts/060_o1_mul_de.opt

@@ -0,0 +1,25 @@
+;; Change sequence:
+;; ld h, XX
+;; ld d, h
+
+;; into:
+
+;; ld d, XX
+
+;; if it's used for an 8 bit multiplication (mul d, e)
+
+OLEVEL: 1
+OFLAG: 1
+
+REPLACE {{
+ ld h, $1
+ ld d, h
+ ld e, a
+ mul d, e
+}}
+
+WITH {{
+ ld d, $1
+ ld e, a
+ mul d, e
+}}

tests/functional/zxnext/muli8.asm

@@ -23,8 +23,7 @@ _a:
 .core.ZXBASIC_USER_DATA_END:
 .core.__MAIN_PROGRAM__:
 	ld a, (_a)
-	ld h, 3
-	ld d, h
+	ld d, 3
 	ld e, a
 	mul d, e
 	ld a, e

tests/functional/zxnext/mulu8.asm

@@ -23,8 +23,7 @@ _a:
 .core.ZXBASIC_USER_DATA_END:
 .core.__MAIN_PROGRAM__:
 	ld a, (_a)
-	ld h, 3
-	ld d, h
+	ld d, 3
 	ld e, a
 	mul d, e
 	ld a, e