Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
8269335: Unable to load svml library
Reviewed-by: psandoz
  • Loading branch information
Sandhya Viswanathan committed Jun 25, 2021
1 parent 4eb3212 commit 1e3b418a53a080a53827989393362338b43dd363
Showing with 77 additions and 1 deletion.
  1. +5 −1 src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
  2. +72 −0 test/jdk/jdk/incubator/vector/LoadSvmlTest.java
@@ -39,6 +39,7 @@
#include "oops/objArrayKlass.hpp"
#include "oops/oop.inline.hpp"
#include "prims/methodHandles.hpp"
#include "runtime/arguments.hpp"
#include "runtime/frame.inline.hpp"
#include "runtime/handles.inline.hpp"
#include "runtime/sharedRuntime.hpp"
@@ -7000,7 +7001,10 @@ address generate_avx_ghash_processBlocks() {
// Get svml stub routine addresses
void *libsvml = NULL;
char ebuf[1024];
libsvml = os::dll_load(JNI_LIB_PREFIX "svml" JNI_LIB_SUFFIX, ebuf, sizeof ebuf);
char dll_name[JVM_MAXPATHLEN];
if (os::dll_locate_lib(dll_name, sizeof(dll_name), Arguments::get_dll_dir(), "svml")) {
libsvml = os::dll_load(dll_name, ebuf, sizeof ebuf);
}
if (libsvml != NULL) {
// SVML method naming convention
// All the methods are named as __svml_op<T><N>_ha_<VV>
@@ -0,0 +1,72 @@
/*
* Copyright (c) 2021, 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.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/

/*
* @test
* @bug 8269335
* @summary Tests SVML shared library is loaded successfully.
* @modules jdk.incubator.vector
* @requires vm.compiler2.enabled
* @requires os.arch == "x86_64" | os.arch == "amd64"
* @requires os.family == "linux" | os.family == "windows"
* @library /test/lib
* @run main LoadSvmlTest
*/

import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.process.OutputAnalyzer;

import jdk.incubator.vector.FloatVector;
import jdk.incubator.vector.VectorOperators;
import jdk.incubator.vector.Vector;
import jdk.incubator.vector.VectorSpecies;


public class LoadSvmlTest {

private static class VectorTest {

static final VectorSpecies<Float> SPECIES = FloatVector.SPECIES_PREFERRED;

public static void main(String[] args) throws Exception {
float a[] = new float [1024];
float r[] = new float [1024];

for (int i = 0; i < a.length; i += SPECIES.length()) {
FloatVector av = FloatVector.fromArray(SPECIES, a, i);
av.lanewise(VectorOperators.SINH).intoArray(r, i);
}
}
}

public static void main(String... args) throws Exception {
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-Xmn8m", "-Xlog:library=info",
"--add-modules=jdk.incubator.vector",
VectorTest.class.getName());

OutputAnalyzer output = new OutputAnalyzer(pb.start());
output.shouldHaveExitValue(0);
output.shouldMatch("Loaded library .*svml");
}
}

1 comment on commit 1e3b418

@openjdk-notifier

This comment has been minimized.

Copy link

@openjdk-notifier openjdk-notifier bot commented on 1e3b418 Jun 25, 2021

Please sign in to comment.