[GR-31345] Increase coverage in several compiler packages.

PullRequest: graal/13903

Author: wirthi

compiler/src/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64MacroAssembler.java

@@ -1524,18 +1524,6 @@ public void not(int size, Register dst, Register src) {
         super.orn(size, dst, zr, src, ShiftType.LSL, 0);
     }
 
-    /**
-     * dst = src1 & ~(src2) and sets condition flags.
-     *
-     * @param size register size. Has to be 32 or 64.
-     * @param dst general purpose register. May not be null or stackpointer.
-     * @param src1 general purpose register. May not be null or stackpointer.
-     * @param src2 general purpose register. May not be null or stackpointer.
-     */
-    public void bics(int size, Register dst, Register src1, Register src2) {
-        super.bics(size, dst, src1, src2, ShiftType.LSL, 0);
-    }
-
     /**
      * Sign-extend value from src into dst.
      *
@@ -1935,16 +1923,6 @@ public enum AArch64ExceptionCode {
         }
     }
 
-    /**
-     * Halting mode software breakpoint: Enters halting mode debug state if enabled, else treated as
-     * UNALLOCATED instruction.
-     *
-     * @param exceptionCode exception code specifying why halt was called. Non null.
-     */
-    public void hlt(AArch64ExceptionCode exceptionCode) {
-        super.hlt(exceptionCode.encoding);
-    }
-
     /**
      * Monitor mode software breakpoint: exception routed to a debug monitor executing in a higher
      * exception level.
@@ -1966,14 +1944,6 @@ public void nop() {
         super.hint(SystemHint.NOP);
     }
 
-    /**
-     * Consumption of Speculative Data Barrier. This is a memory barrier that controls speculative
-     * execution and data value prediction.
-     */
-    public void csdb() {
-        super.hint(SystemHint.CSDB);
-    }
-
     /**
      * Ensures current execution state is committed before continuing.
      */

compiler/src/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64LIRGenerator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -97,7 +97,6 @@
 
 import jdk.vm.ci.aarch64.AArch64;
 import jdk.vm.ci.aarch64.AArch64Kind;
-import jdk.vm.ci.code.CallingConvention;
 import jdk.vm.ci.code.Register;
 import jdk.vm.ci.code.RegisterValue;
 import jdk.vm.ci.code.StackSlot;
@@ -792,8 +791,6 @@ public LIRInstruction createZapArgumentSpace(StackSlot[] zappedStack, JavaConsta
         return new AArch64ZapStackOp(zappedStack, zapValues);
     }
 
-    public abstract void emitCCall(long address, CallingConvention nativeCallingConvention, Value[] args);
-
     @Override
     public void emitSpeculationFence() {
         append(new AArch64SpeculativeBarrier());

compiler/src/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugConfig.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -80,13 +80,6 @@ public interface DebugConfig {
      */
     boolean isVerifyEnabled(DebugContext.Scope scope);
 
-    /**
-     * Determines if verification is enabled for any {@link JavaMethod} in the provided scope.
-     *
-     * @see DebugContext#verify(Object, String)
-     */
-    boolean isVerifyEnabledForMethod(DebugContext.Scope scope);
-
     /**
      * @see DebugContext#timer(CharSequence)
      */

compiler/src/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugConfigImpl.java

@@ -145,11 +145,6 @@ public boolean isVerifyEnabled(DebugContext.Scope scope) {
         return isEnabled(scope, verifyFilter);
     }
 
-    @Override
-    public boolean isVerifyEnabledForMethod(DebugContext.Scope scope) {
-        return isEnabledForMethod(scope, verifyFilter);
-    }
-
     @Override
     public boolean isTimeEnabled(DebugContext.Scope scope) {
         return isEnabled(scope, timerFilter);

compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLIRGenerator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2018, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -66,7 +66,6 @@
 import org.graalvm.compiler.lir.Variable;
 import org.graalvm.compiler.lir.VirtualStackSlot;
 import org.graalvm.compiler.lir.aarch64.AArch64AddressValue;
-import org.graalvm.compiler.lir.aarch64.AArch64CCall;
 import org.graalvm.compiler.lir.aarch64.AArch64Call;
 import org.graalvm.compiler.lir.aarch64.AArch64ControlFlow.StrategySwitchOp;
 import org.graalvm.compiler.lir.aarch64.AArch64FrameMapBuilder;
@@ -149,25 +148,6 @@ protected void emitForeignCallOp(ForeignCallLinkage linkage, Value targetAddress
         }
     }
 
-    @Override
-    public void emitTailcall(Value[] args, Value address) {
-        throw GraalError.unimplemented();
-    }
-
-    @Override
-    public void emitCCall(long address, CallingConvention nativeCallingConvention, Value[] args) {
-        Value[] argLocations = new Value[args.length];
-        getResult().getFrameMapBuilder().callsMethod(nativeCallingConvention);
-        for (int i = 0; i < args.length; i++) {
-            Value arg = args[i];
-            AllocatableValue loc = nativeCallingConvention.getArgument(i);
-            emitMove(loc, arg);
-            argLocations[i] = loc;
-        }
-        Value ptr = emitLoadConstant(LIRKind.value(AArch64Kind.QWORD), JavaConstant.forLong(address));
-        append(new AArch64CCall(nativeCallingConvention.getReturn(), ptr, argLocations));
-    }
-
     /**
      * @param savedRegisters the registers saved by this operation which may be subject to pruning
      * @param savedRegisterLocations the slots to which the registers are saved

compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLoadAddressOp.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,12 +33,9 @@
 import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK;
 
 import org.graalvm.compiler.asm.Label;
-import org.graalvm.compiler.asm.aarch64.AArch64Address;
 import org.graalvm.compiler.asm.aarch64.AArch64Assembler;
 import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
 import org.graalvm.compiler.core.common.CompressEncoding;
-import org.graalvm.compiler.hotspot.HotSpotMarkId;
-import org.graalvm.compiler.lir.LIRInstruction;
 import org.graalvm.compiler.lir.LIRInstructionClass;
 import org.graalvm.compiler.lir.StandardOp.LoadConstantOp;
 import org.graalvm.compiler.lir.aarch64.AArch64LIRInstruction;
@@ -85,30 +82,6 @@ public Constant getConstant() {
         }
     }
 
-    public static final class BaseMove extends AArch64LIRInstruction {
-        public static final LIRInstructionClass<BaseMove> TYPE = LIRInstructionClass.create(BaseMove.class);
-
-        @LIRInstruction.Def({REG, HINT}) protected AllocatableValue result;
-
-        public BaseMove(AllocatableValue result) {
-            super(TYPE);
-            this.result = result;
-        }
-
-        @Override
-        public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
-            try (AArch64MacroAssembler.ScratchRegister sc = masm.getScratchRegister()) {
-                Register scratch = sc.getRegister();
-                masm.adrp(scratch);
-                masm.add(64, scratch, scratch, 1);
-                masm.ldr(64, asRegister(result), AArch64Address.createBaseRegisterOnlyAddress(64, scratch));
-                masm.nop();
-                crb.recordMark(HotSpotMarkId.NARROW_KLASS_BASE_ADDRESS);
-            }
-        }
-
-    }
-
     /**
      * Compresses a 8-byte pointer as a 4-byte int.
      */

compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotMove.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -425,11 +425,6 @@ public Variable emitForeignCall(ForeignCallLinkage linkage, LIRFrameState state,
         return result;
     }
 
-    @Override
-    public void emitTailcall(Value[] args, Value address) {
-        append(new AMD64TailcallOp(args, address));
-    }
-
     @Override
     public void emitCCall(long address, CallingConvention nativeCallingConvention, Value[] args, int numberOfFloatingPointArguments) {
         Value[] argLocations = new Value[args.length];

compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLIRGenerator.java

@@ -39,14 +39,6 @@
  */
 public interface HotSpotLIRGenerator extends LIRGeneratorTool {
 
-    /**
-     * Emits an operation to make a tail call.
-     *
-     * @param args the arguments of the call
-     * @param address the target address of the call
-     */
-    void emitTailcall(Value[] args, Value address);
-
     /**
      * Emits code that jumps to the deopt blob uncommon_trap entry point with {@code action} and
      * {@code reason}.

compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotLIRGenerator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -243,8 +243,6 @@ public final void close() {
 
     protected abstract int findNodeId(Node n);
 
-    protected abstract void findExtraNodes(Node node, Collection<? super Node> extraNodes);
-
     protected abstract boolean hasPredecessor(Node node);
 
     protected abstract int findNodesCount(Graph info);