From 750b0ce46d6b74f890c0b750049aafa65e3deb77 Mon Sep 17 00:00:00 2001
From: occheung <dc@m-labs.hk>
Date: Mon, 8 Nov 2021 13:04:48 +0800
Subject: [PATCH] ddb_temp: select appropriate compiler target

---
 artiq/coredevice/core.py             | 10 ++++++----
 artiq/frontend/artiq_ddb_template.py | 14 ++++++++------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/artiq/coredevice/core.py b/artiq/coredevice/core.py
index dc8207266..529c42f98 100644
--- a/artiq/coredevice/core.py
+++ b/artiq/coredevice/core.py
@@ -11,7 +11,7 @@ from artiq.language.units import *
 
 from artiq.compiler.module import Module
 from artiq.compiler.embedding import Stitcher
-from artiq.compiler.targets import RISCVTarget, CortexA9Target
+from artiq.compiler.targets import RV32IMATarget, RV32GTarget, CortexA9Target
 
 from artiq.coredevice.comm_kernel import CommKernel, CommKernelDummy
 # Import for side effects (creating the exception classes).
@@ -71,11 +71,13 @@ class Core:
         "core", "ref_period", "coarse_ref_period", "ref_multiplier",
     }
 
-    def __init__(self, dmgr, host, ref_period, ref_multiplier=8, target="riscv"):
+    def __init__(self, dmgr, host, ref_period, ref_multiplier=8, target="rv32g"):
         self.ref_period = ref_period
         self.ref_multiplier = ref_multiplier
-        if target == "riscv":
-            self.target_cls = RISCVTarget
+        if target == "rv32g":
+            self.target_cls = RV32GTarget
+        elif target == "rv32ima":
+            self.target_cls = RV32IMATarget
         elif target == "cortexa9":
             self.target_cls = CortexA9Target
         else:
diff --git a/artiq/frontend/artiq_ddb_template.py b/artiq/frontend/artiq_ddb_template.py
index 4dfba4f93..52408a0d4 100755
--- a/artiq/frontend/artiq_ddb_template.py
+++ b/artiq/frontend/artiq_ddb_template.py
@@ -11,14 +11,16 @@ from artiq.coredevice import jsondesc
 
 
 def process_header(output, description):
-    if description["target"] not in ("kasli", "kasli_soc"):
+    if description["target"] == "kasli":
+        if description["hw_rev"] in ("v1.0", "v1.1"):
+            cpu_target = "rv32ima"
+        else:
+            cpu_target = "rv32g"
+    elif description["target"] == "kasli_soc":
+        cpu_target = "cortexa9"
+    else:
         raise NotImplementedError
 
-    cpu_target = {
-        "kasli": "riscv",
-        "kasli_soc": "cortexa9"
-    }[description["target"]]
-
     print(textwrap.dedent("""
         # Autogenerated for the {variant} variant
         core_addr = "{core_addr}"