[FFmpeg-cvslog] checkasm: Issue emms after benchmarking functions

Martin Storsjö git at videolan.org
Fri Oct 7 14:18:23 EEST 2016

ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Tue Jun 21 14:00:01 2016 +0300| [dc7501e524dc3270335749302c7aa449973625f3] | committer: Martin Storsjö

checkasm: Issue emms after benchmarking functions

The functions may not clean up properly after using MMX
registers. For the normal testing calls, the checkasm_checked_call
functions will do the cleanup (and check that functions that
should clean up do it as well), but when benchmarking functions
that don't clean up, we don't currently properly clean up at all.

This causes issues if a benchmarked function is followed by testing
of a function that is supposed to not clobber the MMX/FPU state but
doesn't touch it at all.

Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dc7501e524dc3270335749302c7aa449973625f3

 tests/checkasm/checkasm.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h
index 619ebc7..0faf3ba 100644
--- a/tests/checkasm/checkasm.h
+++ b/tests/checkasm/checkasm.h
@@ -27,6 +27,7 @@
 #include "config.h"
 #include "libavutil/avstring.h"
 #include "libavutil/cpu.h"
+#include "libavutil/internal.h"
 #include "libavutil/lfg.h"
 #include "libavutil/timer.h"
@@ -161,6 +162,7 @@ void checkasm_checked_call(void *func, ...);
+            emms_c();\
             checkasm_update_bench(tcount, tsum);\
     } while (0)

More information about the ffmpeg-cvslog mailing list