lcb: Fixed register order for subregisters (#461)

* lcb: Fixed register order for subregisters

* lcb: Updated test

Author: kper

vadl/main/resources/templates/lcb/llvm/lib/Target/RegisterInfo.td

@@ -1,9 +1,7 @@
-let Namespace = "[(${namespace})]" in {
-  // SubRegIndexes for GPR registers
-  def sub_32   : SubRegIndex<32>;
-  def sub_32_hi : SubRegIndex<32, 32>;
-  def full_64    : SubRegIndex<64>;
-}
+// SubRegIndexes for GPR registers
+def SUB_32   : SubRegIndex<32>;
+def SUB_32_HI : SubRegIndex<32, 32>;
+def FULL_64    : SubRegIndex<64>;
 
 [# th:each="register, iterStat : ${aliasRegisters}" ]
 def [(${register.name})] : Register<"[(${register.name})]">

vadl/main/vadl/lcb/template/lib/Target/EmitRegisterInfoTableGenFilePass.java

@@ -19,13 +19,16 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 import vadl.configuration.LcbConfiguration;
+import vadl.gcb.valuetypes.CompilerRegister;
 import vadl.lcb.passes.llvmLowering.GenerateTableGenRegistersPass;
+import vadl.lcb.passes.llvmLowering.tablegen.model.register.TableGenRegister;
 import vadl.lcb.passes.llvmLowering.tablegen.model.register.TableGenRegisterClass;
 import vadl.lcb.template.CommonVarNames;
 import vadl.lcb.template.LcbTemplateRenderingPass;
@@ -126,13 +129,31 @@ protected Map<String, Object> createVariables(final PassResults passResults,
       outputAliasRegisterClasses.add(new WrappedRegisterFile(registerClass, allocationSeq));
     }
 
+    var registers = sortRegisters(output.registers());
     return Map.of(CommonVarNames.NAMESPACE,
         lcbConfiguration().targetName().value().toLowerCase(),
         "pointerAlignment", DataLayoutProvider.pointerAlignment(abi),
-        "registers", output.registers(),
+        "registers", registers,
         "aliasRegisters", output.aliasRegisters(),
         "registerFiles", outputRegisterClasses,
         "aliasRegisterFiles", outputAliasRegisterClasses
     );
   }
+
+  private List<TableGenRegister> sortRegisters(List<TableGenRegister> registers) {
+    var result = new ArrayList<TableGenRegister>();
+    var ready = new HashSet<CompilerRegister>();
+
+    while (result.size() != registers.size()) {
+      for (var register : registers) {
+        var allSubRegisters = ready.containsAll(register.subRegs());
+        if (allSubRegisters && !ready.contains(register.compilerRegister())) {
+          ready.add(register.compilerRegister());
+          result.add(register);
+        }
+      }
+    }
+
+    return result;
+  }
 }