framework: move instruments -> instrument

Use the singular to be consistent with other modules in wa.framework.

wa/instruments/dmesg.py

@@ -18,7 +18,7 @@ import os
 
 from wa import Instrument, Parameter
 from wa.framework.exception import InstrumentError
-from wa.framework.instruments import slow
+from wa.framework.instrument import slow
 from wa.utils.misc import ensure_file_directory_exists as _f
 
 class DmesgInstrument(Instrument):

wa/instruments/hwmon.py

@@ -16,7 +16,7 @@
 from devlib import HwmonInstrument as _Instrument
 
 from wa import Instrument
-from wa.framework.instruments import fast
+from wa.framework.instrument import fast
 
 MOMENTARY_QUANTITIES = ['temperature', 'power', 'voltage', 'current', 'fps']
 CUMULATIVE_QUANTITIES = ['energy', 'tx', 'tx/rx', 'frames']

wa/instruments/misc.py

@@ -39,7 +39,7 @@ from devlib.utils.android import ApkInfo
 
 from wa import Instrument, Parameter, very_fast
 from wa.framework.exception import ConfigError
-from wa.framework.instruments import slow
+from wa.framework.instrument import slow
 from wa.utils.misc import as_relative, diff_tokens, write_table
 from wa.utils.misc import ensure_file_directory_exists as _f
 from wa.utils.misc import ensure_directory_exists as _d

wa/instruments/trace_cmd.py

@@ -22,7 +22,7 @@ from devlib import FtraceCollector
 
 from wa import Instrument, Parameter
 from wa.framework import signal
-from wa.framework.instruments import very_slow
+from wa.framework.instrument import very_slow
 from wa.framework.exception import InstrumentError
 from wa.utils.types import list_of_strings
 from wa.utils.misc import which