Mercurial > hg > truffle
diff src/share/vm/runtime/arguments.cpp @ 13819:49db2c1e3bee
added support for co-existing GPU backends (JBS:GRAAL-1)
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Thu, 30 Jan 2014 00:52:33 +0100 |
parents | 02f27ecb4f3a |
children | d8041d695d19 |
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.cpp Thu Jan 30 00:48:41 2014 +0100 +++ b/src/share/vm/runtime/arguments.cpp Thu Jan 30 00:52:33 2014 +0100 @@ -131,9 +131,6 @@ SystemProperty *Arguments::_java_home = NULL; SystemProperty *Arguments::_java_class_path = NULL; SystemProperty *Arguments::_sun_boot_class_path = NULL; -#ifdef GRAAL -SystemProperty *Arguments::_graal_gpu_isalist = NULL; -#endif char* Arguments::_meta_index_path = NULL; char* Arguments::_meta_index_dir = NULL; @@ -197,9 +194,6 @@ _sun_boot_class_path = new SystemProperty("sun.boot.class.path", NULL, true); _java_class_path = new SystemProperty("java.class.path", "", true); -#ifdef GRAAL - _graal_gpu_isalist = new SystemProperty("graal.gpu.isalist", NULL, true); -#endif // Add to System Property list. PropertyList_add(&_system_properties, _java_ext_dirs); @@ -209,9 +203,6 @@ PropertyList_add(&_system_properties, _java_home); PropertyList_add(&_system_properties, _java_class_path); PropertyList_add(&_system_properties, _sun_boot_class_path); -#ifdef GRAAL - PropertyList_add(&_system_properties, _graal_gpu_isalist); -#endif // Set OS specific system properties values os::init_system_properties_values(); @@ -3844,24 +3835,6 @@ } } -#ifdef GRAAL - if (_graal_gpu_isalist->value() == NULL) { - // Initialize the graal.gpu.isalist system property if - // a) it was not explicitly defined by the user and - // b) at least one GPU is available. - // GPU offload can be disabled by setting the property - // to the empty string on the command line - if (gpu::is_available() && gpu::has_gpu_linkage()) { - if (gpu::get_target_il_type() == gpu::PTX) { - _graal_gpu_isalist->append_value("PTX"); - } - if (gpu::get_target_il_type() == gpu::HSAIL) { - _graal_gpu_isalist->append_value("HSAIL"); - } - } - } -#endif - return JNI_OK; }