Summary
Description: Phoronix Test Suite open-source benchmarking development
Last Change: Fri 5/17/13 22:52
Recent Commits
>
--git a/pts-core/objects/phodevi/components/phodevi_gpu.php b/pts-core/objects/phodevi/components/phodevi_gpu.php
index 834803d..ded42a0 100644
--- a/pts-core/objects/phodevi/components/phodevi_gpu.php
+++ b/pts-core/objects/phodevi/components/phodevi_gpu.php
@@ -832,9 +832,9 @@ class phodevi_gpu extends phodevi_device_interface
}
// Fallback to base frequency
- if($core_freq == 0 && is_file('/sys/kernel/debug/dri/0/i915_cur_delayinfo'))
+ if($core_freq == 0 && isset(phodevi::$vfs->i915_cur_delayinfo))
{
- $i915_cur_delayinfo = file_get_contents('/sys/kernel/debug/dri/0/i915_cur_delayinfo');
+ $i915_cur_delayinfo = phodevi::$vfs->i915_cur_delayinfo;
$freq = strpos($i915_cur_delayinfo, 'Max non-overclocked (RP0) frequency: ');
if($freq === false)
@@ -1042,9 +1042,9 @@ class phodevi_gpu extends phodevi_device_interface
}
}
}
- if($was_reset == false && is_readable('/sys/kernel/debug/dri/0/i915_capabilities'))
+ if($was_reset == false && isset(phodevi::$vfs->i915_capabilities))
{
- $i915_caps = file_get_contents('/sys/kernel/debug/dri/0/i915_capabilities');
+ $i915_caps = phodevi::$vfs->i915_capabilities;
if(($x = strpos($i915_caps, 'gen: ')) !== false)
{
$gen = substr($i915_caps, ($x + 5));
diff --git a/pts-core/objects/phodevi/phodevi_vfs.php b/pts-core/objects/phodevi/phodevi_vfs.php
index dfce3af..c05d05a 100644
--- a/pts-core/objects/phodevi/phodevi_vfs.php
+++ b/pts-core/objects/phodevi/phodevi_vfs.php
@@ -28,6 +28,7 @@ class phodevi_vfs
// name => F/C - Cacheable? - File / Command - Additional Checks
// F = File, C = Command
'cpuinfo' => array('type' => 'F', 'F' => '/proc/cpuinfo', 'cacheable' => true, 'preserve' => true, 'subsystem' => 'CPU'),
+ 'scaling_available_frequencies' => array('type' => 'F', 'F' => '/sys/devices/system/cpu/cpu0/cpufreq/scaling_available_frequencies', 'cacheable' => false, 'preserve' => true, 'subsystem' => 'CPU'),
'meminfo' => array('type' => 'F', 'F' => '/proc/meminfo', 'cacheable' => true, 'preserve' => true, 'subsystem' => 'Memory'),
'modules' => array('type' => 'F', 'F' => '/proc/modules', 'cacheable' => false, 'preserve' => true, 'subsystem' => 'System'),
'cmdline' => array('type' => 'F', 'F' => '/proc/cmdline', 'cacheable' => true, 'preserve' => true, 'subsystem' => 'System'),
@@ -35,6 +36,9 @@ class phodevi_vfs
'mounts' => array('type' => 'F', 'F' => '/proc/mounts', 'cacheable' => false, 'preserve' => true, 'subsystem' => 'Disk'),
'glxinfo' => array('type' => 'C', 'C' => 'glxinfo', 'cacheable' => true, 'preserve' => true, 'subsystem' => 'GPU'),
'radeon_pm_info' => array('type' => 'F', 'F' => '/sys/kernel/debug/dri/0/radeon_pm_info', 'cacheable' => false, 'preserve' => true, 'subsystem' => 'GPU'),
+ 'i915_capabilities' => array('type' => 'F', 'F' => '/sys/kernel/debug/dri/0/i915_capabilities', 'cacheable' => true, 'preserve' => true, 'subsystem' => 'GPU'),
+ 'i915_cur_delayinfo' => array('type' => 'F', 'F' => '/sys/kernel/debug/dri/0/i915_cur_delayinfo', 'cacheable' => false, 'preserve' => true, 'subsystem' => 'GPU'),
+ 'i915_drpc_info' => array('type' => 'F', 'F' => '/sys/kernel/debug/dri/0/i915_drpc_info', 'cacheable' => false, 'preserve' => true, 'subsystem' => 'GPU'),
'xorg_log' => array('type' => 'F', 'F' => '/var/log/Xorg.0.log', 'cacheable' => true, 'preserve' => true, 'subsystem' => 'System', 'remove_timestamps' => true),
'xorg_conf' => array('type' => 'F', 'F' => '/etc/X11/xorg.conf', 'cacheable' => true, 'preserve' => true, 'subsystem' => 'System'),
);
diff --git a/pts-core/objects/phodevi/sensors/gpu_freq.php b/pts-core/objects/phodevi/sensors/gpu_freq.php
index 1323967..4c7a861 100644
--- a/pts-core/objects/phodevi/sensors/gpu_freq.php
+++ b/pts-core/objects/phodevi/sensors/gpu_freq.php
@@ -109,9 +109,9 @@ class gpu_freq implements phodevi_sensor
}
}
}
- else if(is_file('/sys/kernel/debug/dri/0/i915_cur_delayinfo'))
+ else if(isset(phodevi::$vfs->i915_cur_delayinfo))
{
- $i915_cur_delayinfo = file_get_contents('/sys/kernel/debug/dri/0/i915_cur_delayinfo');
+ $i915_cur_delayinfo = phodevi::$vfs->i915_cur_delayinfo;
$cagf = strpos($i915_cur_delayinfo, 'CAGF: ');
if($cagf !== false)
<
Copyright © 2013 by Phoronix Media