lcb: Move operand format fields method to llvm record

Author: benjaminkasper99

vadl/main/vadl/lcb/codegen/expansion/PseudoExpansionCodeGenerator.java

@@ -30,7 +30,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 import vadl.cppCodeGen.FunctionCodeGenerator;
 import vadl.cppCodeGen.SymbolTable;
 import vadl.cppCodeGen.context.CGenContext;
@@ -43,8 +42,6 @@
 import vadl.gcb.valuetypes.TargetName;
 import vadl.gcb.valuetypes.VariantKind;
 import vadl.lcb.passes.llvmLowering.domain.LlvmLoweringRecord;
-import vadl.lcb.passes.llvmLowering.tablegen.model.tableGenOperand.TableGenInstructionOperand;
-import vadl.lcb.passes.llvmLowering.tablegen.model.tableGenOperand.tableGenParameter.TableGenParameterTypeAndName;
 import vadl.lcb.passes.relocation.GenerateLinkerComponentsPass;
 import vadl.utils.Pair;
 import vadl.viam.Format;
@@ -423,12 +420,9 @@ private List<Pair<Format.Field, ExpressionNode>> reorderParameters(
 
     var llvmRecord = ensureNonNull(machineInstructionRecords.get(instruction),
         () -> Diagnostic.error("Cannot find llvmRecord for instruction used in pseudo instruction",
-        instruction.sourceLocation()));
+            instruction.sourceLocation()));
 
-    var order = Stream.concat(
-        llvmRecord.info().outputs().stream().map(op -> getFormatField(op, instruction)),
-        llvmRecord.info().inputs().stream().map(op -> getFormatField(op, instruction))
-    ).toList();
+    var order = llvmRecord.info().outputInputOperandsFormatFields();
 
     for (var item : order) {
       var l = ensureNonNull(lookup.get(item),
@@ -440,20 +434,6 @@ private List<Pair<Format.Field, ExpressionNode>> reorderParameters(
     return result;
   }
 
-  private Format.Field getFormatField(TableGenInstructionOperand operand, Instruction instruction) {
-    for (var field : instruction.format().fields()) {
-      if (field.identifier.simpleName().equals(getParameterName(operand))) {
-        return field;
-      }
-    }
-    throw Diagnostic.error("Cannot find format's field in pseudo instruction ",
-        instruction.sourceLocation()).build();
-  }
-
-  private String getParameterName(TableGenInstructionOperand operand) {
-    return ((TableGenParameterTypeAndName) operand.parameter()).name();
-  }
-
   @Override
   public String genFunctionSignature() {
     return "std::vector<MCInst> %sMCInstExpander::%s_%s".formatted(targetName.value(),

vadl/main/vadl/lcb/passes/llvmLowering/LlvmLoweringPass.java

@@ -68,6 +68,7 @@
 import vadl.pass.Pass;
 import vadl.pass.PassName;
 import vadl.pass.PassResults;
+import vadl.utils.SourceLocation;
 import vadl.viam.Abi;
 import vadl.viam.Format;
 import vadl.viam.Instruction;
@@ -113,6 +114,33 @@ public int findInputIndex(Format.Field field) {
       throw Diagnostic.error("Cannot find field in inputs.", field.sourceLocation()).build();
     }
 
+    /**
+     * Return the concatenation of {@link #outputs} and {@link #inputs} in that order.
+     */
+    public List<TableGenInstructionOperand> outputInputOperands() {
+      var result = new ArrayList<>(outputs);
+      result.addAll(inputs);
+      return result;
+    }
+
+    /**
+     * Return the format fields of the {@link #outputs} and {@link #inputs}.
+     *
+     * @throws Diagnostic if any operand is not a {@link ReferencesFormatField}.
+     */
+    public List<Format.Field> outputInputOperandsFormatFields() {
+      var result = new ArrayList<Format.Field>();
+      for (var operand : outputInputOperands()) {
+        if (operand instanceof ReferencesFormatField x) {
+          result.add(x.formatField());
+        } else {
+          throw Diagnostic.error("Expected to find format field on operand.",
+              SourceLocation.INVALID_SOURCE_LOCATION).build();
+        }
+      }
+      return result;
+    }
+
     public BaseInstructionInfo withFlags(LlvmLoweringPass.Flags newFlags) {
       return new BaseInstructionInfo(inputs, outputs, newFlags, uses, defs);
     }