fix(riscv): not cache non const value

Author: yjl9903

src/riscv/machine_builder.mbt

@@ -98,7 +98,8 @@ fn MachineVar::from_ssa(var : @ssa.Var) -> MachineVar {
 struct Builder {
   method : MachineMethod
   vars : Map[Int, MachineVar]
-  imported_global_vars : Map[String, MachineVar]
+  imported_global_consts : Map[String, MachineVar]
+  imported_global_labels : Map[String, MachineVar]
 
   // for global vars
   world : MachineWorld
@@ -112,7 +113,13 @@ fn Builder::new(world : MachineWorld, method : MachineMethod) -> Builder {
   }
   method.params.each(fn { p => vars.set(p.id, p) })
   method.local_vars.each(fn { v => vars.set(v.id, v) })
-  Builder::{ method, vars, imported_global_vars: Map::new(), world }
+  Builder::{
+    method,
+    vars,
+    imported_global_consts: Map::new(),
+    imported_global_labels: Map::new(),
+    world,
+  }
 }
 
 fn Builder::get_var(self : Builder, var : @ssa.Var) -> MachineVar {
@@ -433,25 +440,31 @@ fn Builder::build_rvalue(
         Some(Int(x)) => Some(Int(x))
         Some(Double(x)) => {
           let label = add_double_const(self.world, x)
-          match self.imported_global_vars.get(label) {
+          match self.imported_global_consts.get(label) {
             Some(tmp) => Some(Var(tmp, Double))
-            None => {
-              let addr = self.add_temp_var(Ptr)
-              stmts.push(Definition(Some(addr), LoadLabel(label)))
-              Some(Load((addr, 0), Double, 202))
-            }
+            None =>
+              match self.imported_global_labels.get(label) {
+                Some(addr) => Some(Load((addr, 0), Double, 202))
+                None => {
+                  let addr = self.add_temp_var(Ptr)
+                  stmts.push(Definition(Some(addr), LoadLabel(label)))
+                  self.imported_global_labels.set(label, addr)
+                  Some(Load((addr, 0), Double, 202))
+                }
+              }
           }
         }
         None => {
           let width = Width::from_low_type(var.ty)
           if var.is_global {
             let (label, _) = self.world.globals.get(var.id).unwrap()
-            match self.imported_global_vars.get(label) {
-              Some(tmp) => Some(Var(tmp, width))
+            match self.imported_global_labels.get(label) {
+              Some(addr) => Some(Load((addr, 0), width, 203))
               None => {
                 let addr = self.add_temp_var(Ptr)
                 stmts.push(Comment("Get global var \{v}"))
                 stmts.push(Definition(Some(addr), LoadLabel(label)))
+                self.imported_global_labels.set(label, addr)
                 Some(Load((addr, 0), width, 203))
               }
             }
@@ -660,15 +673,19 @@ fn Builder::build_get_var(
   } else if var.is_global {
     match self.world.globals.get(var.id) {
       Some((label, g)) =>
-        match self.imported_global_vars.get(label) {
-          Some(tmp) => tmp
+        match self.imported_global_labels.get(label) {
+          Some(addr) => {
+            let tmp = self.add_temp_var(var.ty)
+            stmts.push(Definition(Some(tmp), Load((addr, 0), g.width, 207)))
+            tmp
+          }
           None => {
             let addr = self.add_temp_var(Type::Ptr)
             let tmp = self.add_temp_var(var.ty)
             stmts.push(Comment("Get global var \{var}"))
             stmts.push(Definition(Some(addr), LoadLabel(label)))
             stmts.push(Definition(Some(tmp), Load((addr, 0), g.width, 207)))
-            self.imported_global_vars.set(label, tmp)
+            self.imported_global_labels.set(label, addr)
             tmp
           }
         }
@@ -688,15 +705,29 @@ fn Builder::build_double_const(
   stmts : Array[StmtKind]
 ) -> MachineVar {
   let label = add_double_const(self.world, value)
-  match self.imported_global_vars.get(label) {
+  match self.imported_global_consts.get(label) {
     Some(tmp) => tmp
-    None => {
-      let addr = self.add_temp_var(Type::Ptr)
-      stmts.push(Definition(Some(addr), LoadLabel(label)))
-      let local_const = self.add_temp_var(Double)
-      stmts.push(Definition(Some(local_const), Load((addr, 0), Double, 208)))
-      self.imported_global_vars.set(label, local_const)
-      local_const
-    }
+    None =>
+      match self.imported_global_labels.get(label) {
+        Some(addr) => {
+          let local_const = self.add_temp_var(Double)
+          stmts.push(
+            Definition(Some(local_const), Load((addr, 0), Double, 208)),
+          )
+          self.imported_global_consts.set(label, local_const)
+          local_const
+        }
+        None => {
+          let addr = self.add_temp_var(Type::Ptr)
+          stmts.push(Definition(Some(addr), LoadLabel(label)))
+          let local_const = self.add_temp_var(Double)
+          stmts.push(
+            Definition(Some(local_const), Load((addr, 0), Double, 208)),
+          )
+          self.imported_global_labels.set(label, addr)
+          self.imported_global_consts.set(label, local_const)
+          local_const
+        }
+      }
   }
 }