Rework ATI driver suppressions for bench valgrind

bench/valgrind.supp

Index: bench/valgrind.supp
diff --git a/bench/valgrind.supp b/bench/valgrind.supp
index 0ed963d110831b3c71933914b63d1ad6aabe42b6..aabb900f717867865fb34fbe23e405e81c8660f6 100644
--- a/bench/valgrind.supp
+++ b/bench/valgrind.supp
@@ -1,39 +1,65 @@
 # Valgrind suppressions for bench --config 8888 GPU NONRENDERING --runOnce
 # Pass this file to Valgrind with "--suppressions=bench/valgrind.supp"
 {
-   fglrx 1
-   Memcheck:Param
-   ioctl(generic)
-   fun:ioctl
-   obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
+    ATI driver 1
+    Memcheck:Param
+    ioctl(generic)
+    fun:ioctl
+    ...
+    obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
 }
 {
-   fglrx 2
-   Memcheck:Cond
-   obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
+    ATI driver 2
+    Memcheck:Cond
+    obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
+}
+{
+    ATI driver 3
+    Memcheck:Addr8
+    ...
+    obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
+}
+{
+    ATI driver 4
+    Memcheck:Addr4
+    ...
+    obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
+}
+{
+    ATI driver 5
+    Memcheck:Addr2
+    ...
+    obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
+}
+{
+    ATI driver 6
+    Memcheck:Addr1
+    ...
+    obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
 }
 {
-   fglrx 3
-   Memcheck:Addr8
-   fun:memcpy@GLIBC_2.2.5
-   obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
+    ATI driver 7
+    Memcheck:Leak
+    fun:malloc
+    obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
 }
 {
-   fglrx 3
-   Memcheck:Addr2
-   fun:memcpy@GLIBC_2.2.5
-   obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
+    ATI driver 8
+    Memcheck:Overlap
+    fun:strcpy
+    obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
 }
 {
-   fglrx 4
-   Memcheck:Addr8
-   obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
+    ATI driver 9
+    Memcheck:Leak
+    fun:calloc
+    obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
 }
 {
-   fglrx 5
-   Memcheck:Leak
-   fun:malloc
-   obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
+    ATI driver 10
+    Memcheck:Leak
+    fun:malloc
+    obj:/usr/lib/fglrx/fglrx-libGL.so.1.2
 }
 {
    NV driver 1