lcb: Set types for branch lowering (#522)

Author: kper

vadl/main/resources/templates/lcb/llvm/lib/Target/ISelLowering.cpp

@@ -60,8 +60,8 @@ void [(${namespace})]TargetLowering::anchor() {}
 
     [#th:block th:if="${mergedCmpAndBranch}"]
     setOperationAction(ISD::BRCOND, MVT::Other, Expand);
-    setOperationAction(ISD::BR_CC, MVT::[(${stackPointerType})], Custom);
-    setOperationAction(ISD::SELECT_CC, MVT::[(${stackPointerType})], Custom);
+    setOperationAction(ISD::BR_CC, { [(${branchTypes})] }, Custom);
+    setOperationAction(ISD::SELECT_CC, { [(${branchTypes})] }, Custom);
     setOperationAction(ISD::SETCC, MVT::[(${stackPointerType})], Expand);
     [/th:block]
     [#th:block th:if="${!mergedCmpAndBranch}"]

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

@@ -134,6 +134,7 @@ protected Map<String, Object> createVariables(final PassResults passResults,
     map.put("conditionalValueRangeLowest", conditionalValueRange.lowest());
     map.put("conditionalValueRangeHighest", conditionalValueRange.highest());
     map.put("expandableDagNodes", coverageSummary.notCoveredSelectionDagNodes());
+    map.put("branchTypes", branchTypes(stackPointerType));
     map.put("mergedCmpAndBranch",
         !database.run(
             new Query.Builder().machineInstructionLabels(List.of(
@@ -185,6 +186,14 @@ protected Map<String, Object> createVariables(final PassResults passResults,
     return map;
   }
 
+  private String branchTypes(ValueType stackPointerType) {
+    if (stackPointerType == ValueType.I64) {
+      return "MVT::i32, MVT::i64";
+    } else {
+      return "MVT::i32";
+    }
+  }
+
   private String getFirstNameOrEmpty(QueryResult result) {
     return result.machineInstructions().stream().map(x -> x.identifier().simpleName()).findFirst()
         .orElse("");