test/hotspot/jtreg/compiler/testlibrary/sha/predicate/IntrinsicPredicates.java

@@ -1,7 +1,7 @@
  /*
-  * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+  * Copyright (c) 2014, 2022, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.

@@ -66,39 +66,42 @@
                new OrPredicate(new CPUSpecificPredicate("i386.*",    null, null),
                                new CPUSpecificPredicate("x86.*",     null, null))));
  
      public static final BooleanSupplier SHA1_INSTRUCTION_AVAILABLE
              = new OrPredicate(new CPUSpecificPredicate("aarch64.*", new String[] { "sha1" }, null),
+               new OrPredicate(new CPUSpecificPredicate("riscv64.*", new String[] { "sha1" }, null),
                new OrPredicate(new CPUSpecificPredicate("s390.*",    new String[] { "sha1" }, null),
                // x86 variants
                new OrPredicate(new CPUSpecificPredicate("amd64.*",   new String[] { "sha" },  null),
                new OrPredicate(new CPUSpecificPredicate("i386.*",    new String[] { "sha" },  null),
-                               new CPUSpecificPredicate("x86.*",     new String[] { "sha" },  null)))));
+                               new CPUSpecificPredicate("x86.*",     new String[] { "sha" },  null))))));
  
      public static final BooleanSupplier SHA256_INSTRUCTION_AVAILABLE
              = new OrPredicate(new CPUSpecificPredicate("aarch64.*", new String[] { "sha256"       }, null),
+               new OrPredicate(new CPUSpecificPredicate("riscv64.*", new String[] { "sha256"       }, null),
                new OrPredicate(new CPUSpecificPredicate("s390.*",    new String[] { "sha256"       }, null),
                new OrPredicate(new CPUSpecificPredicate("ppc64.*",   new String[] { "sha"          }, null),
                new OrPredicate(new CPUSpecificPredicate("ppc64le.*", new String[] { "sha"          }, null),
                // x86 variants
                new OrPredicate(new CPUSpecificPredicate("amd64.*",   new String[] { "sha"          }, null),
                new OrPredicate(new CPUSpecificPredicate("i386.*",    new String[] { "sha"          }, null),
                new OrPredicate(new CPUSpecificPredicate("x86.*",     new String[] { "sha"          }, null),
                new OrPredicate(new CPUSpecificPredicate("amd64.*",   new String[] { "avx2", "bmi2" }, null),
-                               new CPUSpecificPredicate("x86_64",    new String[] { "avx2", "bmi2" }, null)))))))));
+                               new CPUSpecificPredicate("x86_64",    new String[] { "avx2", "bmi2" }, null))))))))));
  
      public static final BooleanSupplier SHA512_INSTRUCTION_AVAILABLE
              = new OrPredicate(new CPUSpecificPredicate("aarch64.*", new String[] { "sha512"       }, null),
+               new OrPredicate(new CPUSpecificPredicate("riscv64.*", new String[] { "sha512"       }, null),
                new OrPredicate(new CPUSpecificPredicate("s390.*",    new String[] { "sha512"       }, null),
                new OrPredicate(new CPUSpecificPredicate("ppc64.*",   new String[] { "sha"          }, null),
                new OrPredicate(new CPUSpecificPredicate("ppc64le.*", new String[] { "sha"          }, null),
                // x86 variants
                new OrPredicate(new CPUSpecificPredicate("amd64.*",   new String[] { "sha"          }, null),
                new OrPredicate(new CPUSpecificPredicate("i386.*",    new String[] { "sha"          }, null),
                new OrPredicate(new CPUSpecificPredicate("x86.*",     new String[] { "sha"          }, null),
                new OrPredicate(new CPUSpecificPredicate("amd64.*",   new String[] { "avx2", "bmi2" }, null),
-                               new CPUSpecificPredicate("x86_64",    new String[] { "avx2", "bmi2" }, null)))))))));
+                               new CPUSpecificPredicate("x86_64",    new String[] { "avx2", "bmi2" }, null))))))))));
  
      public static final BooleanSupplier SHA3_INSTRUCTION_AVAILABLE
              // sha3 is only implemented on aarch64 for now
              = new CPUSpecificPredicate("aarch64.*", new String[] {"sha3"          }, null);