From 4621017da1655fcaeac9da882c3176b7183dca87 Mon Sep 17 00:00:00 2001 From: David Linus Briemann Date: Tue, 3 Feb 2026 12:20:32 +0100 Subject: [PATCH] add missing format strings, enable IR matching for >= PPC9 in TestMinMaxIdentity.java --- src/hotspot/cpu/ppc/ppc.ad | 4 ++++ test/hotspot/jtreg/compiler/igvn/TestMinMaxIdentity.java | 2 +- .../lib/ir_framework/test/ApplicableIRRulesPrinter.java | 5 ++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/hotspot/cpu/ppc/ppc.ad b/src/hotspot/cpu/ppc/ppc.ad index 361bb15981d..d4ebb89d9e2 100644 --- a/src/hotspot/cpu/ppc/ppc.ad +++ b/src/hotspot/cpu/ppc/ppc.ad @@ -12324,6 +12324,7 @@ instruct minF(regF dst, regF src1, regF src2) %{ predicate(PowerArchitecturePPC64 >= 9); ins_cost(DEFAULT_COST); + format %{ "MinF $dst, $src1, $src2" %} size(4); ins_encode %{ __ xsminjdp($dst$$FloatRegister->to_vsr(), $src1$$FloatRegister->to_vsr(), $src2$$FloatRegister->to_vsr()); @@ -12336,6 +12337,7 @@ instruct minD(regD dst, regD src1, regD src2) %{ predicate(PowerArchitecturePPC64 >= 9); ins_cost(DEFAULT_COST); + format %{ "MinD $dst, $src1, $src2" %} size(4); ins_encode %{ __ xsminjdp($dst$$FloatRegister->to_vsr(), $src1$$FloatRegister->to_vsr(), $src2$$FloatRegister->to_vsr()); @@ -12348,6 +12350,7 @@ instruct maxF(regF dst, regF src1, regF src2) %{ predicate(PowerArchitecturePPC64 >= 9); ins_cost(DEFAULT_COST); + format %{ "MaxF $dst, $src1, $src2" %} size(4); ins_encode %{ __ xsmaxjdp($dst$$FloatRegister->to_vsr(), $src1$$FloatRegister->to_vsr(), $src2$$FloatRegister->to_vsr()); @@ -12360,6 +12363,7 @@ instruct maxD(regD dst, regD src1, regD src2) %{ predicate(PowerArchitecturePPC64 >= 9); ins_cost(DEFAULT_COST); + format %{ "MaxD $dst, $src1, $src2" %} size(4); ins_encode %{ __ xsmaxjdp($dst$$FloatRegister->to_vsr(), $src1$$FloatRegister->to_vsr(), $src2$$FloatRegister->to_vsr()); diff --git a/test/hotspot/jtreg/compiler/igvn/TestMinMaxIdentity.java b/test/hotspot/jtreg/compiler/igvn/TestMinMaxIdentity.java index 5b998caf65c..132ecea5970 100644 --- a/test/hotspot/jtreg/compiler/igvn/TestMinMaxIdentity.java +++ b/test/hotspot/jtreg/compiler/igvn/TestMinMaxIdentity.java @@ -127,7 +127,7 @@ public class TestMinMaxIdentity { """ @IR(counts = {IRNode.#op, "= 1"}, phase = CompilePhase.BEFORE_MACRO_EXPANSION, - applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"}) + applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "darn", "true"}) @IR(counts = {IRNode.#op, "= 1"}, phase = CompilePhase.BEFORE_MACRO_EXPANSION, applyIfPlatform = {"riscv64", "true"}) diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/test/ApplicableIRRulesPrinter.java b/test/hotspot/jtreg/compiler/lib/ir_framework/test/ApplicableIRRulesPrinter.java index 4fa1f8f3fe5..e50c1fa7ce5 100644 --- a/test/hotspot/jtreg/compiler/lib/ir_framework/test/ApplicableIRRulesPrinter.java +++ b/test/hotspot/jtreg/compiler/lib/ir_framework/test/ApplicableIRRulesPrinter.java @@ -124,7 +124,10 @@ public class ApplicableIRRulesPrinter { "zfh", "zvbb", "zvfh", - "zvkn" + "zvkn", + // PPC64 + "darn", + "brw" )); public ApplicableIRRulesPrinter() {