9 files changed, 105 insertions, 26 deletions

diff --git a/lib/oeqa/runtime/cases/dldt_inference_engine.py b/lib/oeqa/runtime/cases/dldt_inference_engine.py
index 2e969975..fb35d52f 100644
--- a/lib/oeqa/runtime/cases/dldt_inference_engine.py
+++ b/lib/oeqa/runtime/cases/dldt_inference_engine.py
@@ -57,7 +57,7 @@ class DldtInferenceEngine(OERuntimeTestCase):
     @OEHasPackage(['dldt-inference-engine'])
     @OEHasPackage(['dldt-inference-engine-samples'])
     @OEHasPackage(['intel-compute-runtime'])
-    @OEHasPackage(['opencl-icd-loader'])
+    @OEHasPackage(['ocl-icd'])
     def test_dldt_ie_classification_with_gpu(self):
         (status, output) = self.dldt_ie.test_dldt_ie_classification_with_device('GPU', self.ir_files_dir)
         self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
@@ -67,7 +67,11 @@ class DldtInferenceEngine(OERuntimeTestCase):
     @OEHasPackage(['dldt-inference-engine-samples'])
     @OEHasPackage(['dldt-inference-engine-vpu-firmware'])
     def test_dldt_ie_classification_with_myriad(self):
-        (status, output) = self.dldt_ie.test_dldt_ie_classification_with_device('MYRIAD', self.ir_files_dir)
+        device = 'MYRIAD'
+        (status, output) = self.dldt_ie.test_check_if_openvino_device_available(device)
+        if not status:
+            self.skipTest('OpenVINO %s device not available on target machine(availalbe devices: %s)' % (device, output))
+        (status, output) = self.dldt_ie.test_dldt_ie_classification_with_device(device, self.ir_files_dir)
         self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
 
     @OETestDepends(['dldt_inference_engine.DldtInferenceEngine.test_dldt_ie_can_create_ir_and_download_input'])
@@ -76,14 +80,14 @@ class DldtInferenceEngine(OERuntimeTestCase):
     @OEHasPackage(['python3-opencv'])
     @OEHasPackage(['python3-numpy'])
     def test_dldt_ie_classification_python_api_with_cpu(self):
-        (status, output) = self.dldt_ie.test_dldt_ie_classification_python_api_with_device('CPU', self.ir_files_dir, 'libcpu_extension.so')
+        (status, output) = self.dldt_ie.test_dldt_ie_classification_python_api_with_device('CPU', self.ir_files_dir)
         self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
 
     @OETestDepends(['dldt_inference_engine.DldtInferenceEngine.test_dldt_ie_can_create_ir_and_download_input'])
     @OEHasPackage(['dldt-inference-engine'])
     @OEHasPackage(['dldt-inference-engine-python3'])
     @OEHasPackage(['intel-compute-runtime'])
-    @OEHasPackage(['opencl-icd-loader'])
+    @OEHasPackage(['ocl-icd'])
     @OEHasPackage(['python3-opencv'])
     @OEHasPackage(['python3-numpy'])
     def test_dldt_ie_classification_python_api_with_gpu(self):
@@ -97,5 +101,9 @@ class DldtInferenceEngine(OERuntimeTestCase):
     @OEHasPackage(['python3-opencv'])
     @OEHasPackage(['python3-numpy'])
     def test_dldt_ie_classification_python_api_with_myriad(self):
-        (status, output) = self.dldt_ie.test_dldt_ie_classification_python_api_with_device('MYRIAD', self.ir_files_dir)
+        device = 'MYRIAD'
+        (status, output) = self.dldt_ie.test_check_if_openvino_device_available(device)
+        if not status:
+            self.skipTest('OpenVINO %s device not available on target machine(availalbe devices: %s)' % (device, output))
+        (status, output) = self.dldt_ie.test_dldt_ie_classification_python_api_with_device(device, self.ir_files_dir)
         self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
diff --git a/lib/oeqa/runtime/cases/intel_vaapi_driver.py b/lib/oeqa/runtime/cases/intel_vaapi_driver.py
index d5989044..31e11a81 100644
--- a/lib/oeqa/runtime/cases/intel_vaapi_driver.py
+++ b/lib/oeqa/runtime/cases/intel_vaapi_driver.py
@@ -17,7 +17,7 @@ class VaapiDriverTest(OERuntimeTestCase):
         self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
 
         (status, output) = self.target.run('gst-launch-1.0 -ev videotestsrc num-buffers=60 ! '
-                                           'timeoverlay ! vaapih264enc ! mp4mux ! filesink location=/tmp/vtest_h264.mp4')
+                                           'timeoverlay ! vaapih264enc ! h264parse ! mp4mux ! filesink location=/tmp/vtest_h264.mp4')
         self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
 
     @OETestDepends(['intel_vaapi_driver.VaapiDriverTest.test_gstreamer_can_encode_with_intel_vaapi_driver'])
diff --git a/lib/oeqa/runtime/cases/microcode.py b/lib/oeqa/runtime/cases/microcode.py
index 6ce36a6f..52c1cdb4 100644
--- a/lib/oeqa/runtime/cases/microcode.py
+++ b/lib/oeqa/runtime/cases/microcode.py
@@ -16,20 +16,15 @@ class MicrocodeTest(OERuntimeTestCase):
 
     @OEHasPackage(["iucode-tool"])
     def test_microcode_update(self):
-        (status, output) = self.target.run('iucode_tool /lib/firmware/intel-ucode/ -tb -lS | grep rev')
-        if status:
-            self.skipTest("The iucode_tool detected no microcode for update.")
+        (status, output) = self.target.run('iucode_tool /lib/firmware/intel-ucode/ -tb -l --scan-system=2 | grep rev')
 
         selected_microcodes = output.splitlines()
         selected_rev_list = self.get_revision_from_microcode_string_list(selected_microcodes, "rev (\w*)")
-        self.assertTrue(selected_rev_list, msg="Could not find any rev from iucode_tool selected microcode.")
 
-        (status, output) = self.target.run('dmesg | grep microcode')
-        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
+        (status, output) = self.target.run("dmesg | grep 'microcode updated early'")
 
         updated_microcodes = output.splitlines()
-        updated_rev_list = self.get_revision_from_microcode_string_list(updated_microcodes, "revision=(\w*)")
-        self.assertTrue(updated_rev_list, msg="Could not find any updated revision from microcode dmesg.")
+        updated_rev_list = self.get_revision_from_microcode_string_list(updated_microcodes, "revision (\w*)")
 
         for ul in updated_rev_list:
             self.assertTrue(ul in selected_rev_list, msg="Updated revision, %s, not in selected revision list (%s)" %
diff --git a/lib/oeqa/runtime/cases/mkl_dnn.py b/lib/oeqa/runtime/cases/mkl_dnn.py
index c7994b13..8d50df54 100644
--- a/lib/oeqa/runtime/cases/mkl_dnn.py
+++ b/lib/oeqa/runtime/cases/mkl_dnn.py
@@ -14,9 +14,9 @@ class MklDnn(OERuntimeTestCase):
     def tearDownClass(cls):
         cls.mkldnntest.tear_down()
         
-    @OEHasPackage(['libdnnl', 'libdnnl1'])
-    @OEHasPackage(['libdnnl-src'])
-    @OEHasPackage(['libdnnl-dev'])
+    @OEHasPackage(['onednn', 'libdnnl2'])
+    @OEHasPackage(['onednn-src', 'libdnnl-src'])
+    @OEHasPackage(['onednn-dev', 'libdnnl-dev'])
     @OEHasPackage(['gcc'])
     @OEHasPackage(['gcc-symlinks'])
     @OEHasPackage(['libstdc++-dev'])
@@ -25,8 +25,8 @@ class MklDnn(OERuntimeTestCase):
         (status, output) = self.mkldnntest.test_mkldnn_can_compile_and_execute()
         self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
     
-    @OEHasPackage(['mkl-dnn', 'libdnnl1'])
-    @OEHasPackage(['mkl-dnn-test', 'libdnnl-test'])
+    @OEHasPackage(['onednn', 'libdnnl2'])
+    @OEHasPackage(['onednn-test', 'libdnnl-test'])
     def test_mkldnn_benchdnn_package_available(self):
         (status, output) = self.mkldnntest.test_mkldnn_benchdnn_package_available()
         self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
diff --git a/lib/oeqa/runtime/cases/parselogs-ignores-intel-core2-32.txt b/lib/oeqa/runtime/cases/parselogs-ignores-intel-core2-32.txt
new file mode 100644
index 00000000..84ce8168
--- /dev/null
+++ b/lib/oeqa/runtime/cases/parselogs-ignores-intel-core2-32.txt
@@ -0,0 +1,9 @@
+# These should be reviewed to see if they are still needed
+ACPI: No _BQC method, cannot determine initial brightness
+[Firmware Bug]: ACPI: No _BQC method, cannot determine initial brightness
+(EE) Failed to load module "psb"
+(EE) Failed to load module "psbdrv"
+(EE) open /dev/fb0: No such file or directory
+(EE) AIGLX: reverting to software rendering
+dmi: Firmware registration failed.
+ioremap error for 0x78
diff --git a/lib/oeqa/runtime/cases/parselogs-ignores-intel-corei7-64.txt b/lib/oeqa/runtime/cases/parselogs-ignores-intel-corei7-64.txt
new file mode 100644
index 00000000..5c9b4bc7
--- /dev/null
+++ b/lib/oeqa/runtime/cases/parselogs-ignores-intel-corei7-64.txt
@@ -0,0 +1,14 @@
+# These should be reviewed to see if they are still needed
+can't set Max Payload Size to 256
+intel_punit_ipc: can't request region for resource
+[drm] parse error at position 4 in video mode 'efifb'
+ACPI Error: Could not enable RealTimeClock event
+ACPI Warning: Could not enable fixed event - RealTimeClock
+hci_intel INT33E1:00: Unable to retrieve gpio
+hci_intel: probe of INT33E1:00 failed
+can't derive routing for PCI INT A
+failed to read out thermal zone
+Bluetooth: hci0: Setting Intel event mask failed
+ttyS2 - failed to request DMA
+Bluetooth: hci0: Failed to send firmware data (-38)
+atkbd serio0: Failed to enable keyboard on isa0060/serio0
diff --git a/lib/oeqa/runtime/cases/thermald.py b/lib/oeqa/runtime/cases/thermald.py
new file mode 100644
index 00000000..a0b6a92b
--- /dev/null
+++ b/lib/oeqa/runtime/cases/thermald.py
@@ -0,0 +1,47 @@
+from oeqa.runtime.case import OERuntimeTestCase
+from oeqa.core.decorator.depends import OETestDepends
+from oeqa.runtime.decorator.package import OEHasPackage
+import threading
+import time
+import re
+
+class ThermaldTest(OERuntimeTestCase):
+    def get_thermal_zone_with_target_type(self, target_type):
+        i = 0
+        while True:
+            status, output = self.target.run('cat /sys/class/thermal/thermal_zone%s/type' % i)
+            if status:
+                return -1
+            if output == target_type:
+                return i
+            i = i + 1
+
+    def run_thermald_emulation_to_exceed_setpoint_then_end_thermald_process(self, run_args):
+        time.sleep(2)
+        self.target.run('echo 106000 > /sys/class/thermal/thermal_zone%s/emul_temp' % run_args)
+        time.sleep(5)
+        __, output = self.target.run('pidof thermald')
+        self.target.run('kill -9 %s' % output)
+
+    def test_thermald_emulation_mode(self):
+        # Thermald test depend on thermal emulation, where CONFIG_THERMAL_EMULATION=y was required
+        # To enable thermal emulation, refer to https://github.com/intel/thermal_daemon/blob/master/test/readme_test.txt
+        (status, output) = self.target.run('gzip -dc /proc/config.gz | grep CONFIG_THERMAL_EMULATION=y')
+        if status:
+            self.skipTest("CONFIG_THERMAL_EMULATION is not set")
+
+    @OEHasPackage(['thermald'])
+    @OETestDepends(['thermald.ThermaldTest.test_thermald_emulation_mode'])
+    def test_thermald_can_track_thermal_exceed_setpoint(self):
+        x86_thermal_zone_index = self.get_thermal_zone_with_target_type('x86_pkg_temp')
+        if x86_thermal_zone_index < 0:
+            self.skipTest('Could not get the thermal zone index for target type (%s)' % 'x86_pkg_temp')
+        td_thread = threading.Thread(target=self.run_thermald_emulation_to_exceed_setpoint_then_end_thermald_process,
+                                     args=(x86_thermal_zone_index,))
+        td_thread.start()
+        td_thread.join()
+        status, output = self.target.run('timeout 3s thermald --no-daemon --loglevel=info')
+        regex_search = ".*thd_cdev_set_state.*106000"
+        regex_comp = re.compile(regex_search)
+        m = regex_comp.search(output)
+        self.assertTrue(m, msg='status and output: %s and %s' % (status, output))
diff --git a/lib/oeqa/runtime/miutils/tests/dldt_inference_engine_test.py b/lib/oeqa/runtime/miutils/tests/dldt_inference_engine_test.py
index a44f9027..31bfb539 100644
--- a/lib/oeqa/runtime/miutils/tests/dldt_inference_engine_test.py
+++ b/lib/oeqa/runtime/miutils/tests/dldt_inference_engine_test.py
@@ -16,10 +16,18 @@ class DldtInferenceEngineTest(object):
         self.target.run('mkdir -p %s' % self.work_dir)
         self.target.copy_to(os.path.join(files_path, 'dldt-inference-engine', self.ie_input_files['ie_python_sample']),
                             self.work_dir)
+        python_cmd = 'from openvino.inference_engine import IENetwork, IECore; ie = IECore(); print(ie.available_devices)'
+        __, output = self.target.run('python3 -c "%s"' % python_cmd)
+        self.available_devices = output
 
     def tear_down(self):
         self.target.run('rm -rf %s' % self.work_dir)
 
+    def test_check_if_openvino_device_available(self, device):
+        if device not in self.available_devices:
+            return False, self.available_devices
+        return True, self.available_devices
+
     def test_can_download_input_file(self, proxy_port):
         return self.target.run('cd %s; wget %s -e https_proxy=%s' %
                                (self.work_dir,
diff --git a/lib/oeqa/runtime/miutils/tests/mkl_dnn_test.py b/lib/oeqa/runtime/miutils/tests/mkl_dnn_test.py
index 13afd1a4..869a4cbe 100644
--- a/lib/oeqa/runtime/miutils/tests/mkl_dnn_test.py
+++ b/lib/oeqa/runtime/miutils/tests/mkl_dnn_test.py
@@ -9,13 +9,13 @@ class MkldnnTest(object):
         self.target.run('rm /tmp/%s' % self.mkldnn_target_test_filename)
         
     def test_mkldnn_can_compile_and_execute(self):
-        mkldnn_src_dir = '/usr/src/debug/mkl-dnn/'
+        mkldnn_src_dir = '/usr/src/debug/onednn/'
         mkldnn_src_test_filename = 'api.c'
         mkldnn_src_test_file = ''
         
-        (status, output) = self.target.run('cd %s; find -name %s' % (mkldnn_src_dir, mkldnn_src_test_filename))
-        if status:
-            return status, output
+        (__, output) = self.target.run('cd %s; find -name %s' % (mkldnn_src_dir, mkldnn_src_test_filename))
+        if 'No such file or directory' in output:
+            return -1, output
 
         mkldnn_src_test_file = os.path.join(mkldnn_src_dir, output)
         (status, output) = self.target.run('gcc %s -o /tmp/%s -ldnnl' % (mkldnn_src_test_file, self.mkldnn_target_test_filename))
@@ -49,9 +49,7 @@ class MkldnnTest(object):
         return self._run_mkldnn_benchdnn_test('./benchdnn --reorder --batch=inputs/reorder/test_reorder_bfloat16')
         
     def test_mkldnn_rnn_api(self):
-        # test_rnn_inference was not yet ready and was expected to fail
-        # while waiting it to be ready, use test_rnn_small for now
-        return self._run_mkldnn_benchdnn_test('./benchdnn --rnn --batch=inputs/rnn/test_rnn_small')
+        return self._run_mkldnn_benchdnn_test('./benchdnn --rnn --batch=inputs/rnn/test_rnn_all')
         
     def test_mkldnn_shuffle_api(self):
         return self._run_mkldnn_benchdnn_test('./benchdnn --shuffle --batch=inputs/shuffle/test_shuffle_bfloat16')
\ No newline at end of file