trim: Update for --exact -> --auto

diff --git a/cli/cli-trim-single-swapbuffers.script b/cli/cli-trim-single-swapbuffers.script
index a04ad0e77ac4de5476bb6daec192a8f40d8845ba..e653d49f3e5058eb0e514c23cc36e2342d9387ce 100644 (file)
--- a/cli/cli-trim-single-swapbuffers.script
+++ b/cli/cli-trim-single-swapbuffers.script
@@ -1,6 +1,6 @@
 # First, trim the trace to the final glxSwapBuffers call
 
 # First, trim the trace to the final glxSwapBuffers call
 

-apitrace trim --calls=27 tri.trace
+apitrace trim --auto --calls=27 tri.trace

 
 # Then dump the image and compare to our reference
 
 
 # Then dump the image and compare to our reference
 

diff --git a/cli/cli-trim-unused-shaders.script b/cli/cli-trim-unused-shaders.script
index c126ac09ddc42e12769c20a3f5d6a0f76f2a2ca7..2fb53df62111e33fbb8b4690102e4b4123ca3068 100644 (file)
--- a/cli/cli-trim-unused-shaders.script
+++ b/cli/cli-trim-unused-shaders.script
@@ -8,7 +8,7 @@ apitrace dump-images --calls=10,47,50,71,87,88 --call-nos=no -o ./glxsimple-ref/
 
 # Trim to the same callset used to generate reference images
 
 
 # Trim to the same callset used to generate reference images
 

-apitrace trim --calls=10,47,50,71,87,88 glxsimple.trace
+apitrace trim --auto --calls=10,47,50,71,87,88 glxsimple.trace

 
 # Verify that we actually trimmed what we wanted to
 
 
 # Verify that we actually trimmed what we wanted to
 

diff --git a/cli/cli-trim-unused-textures.script b/cli/cli-trim-unused-textures.script
index a82555e8fa4b88d7b4e9493f6213f74d3220d3a5..e90204215dea1a750664e055fc61531aea279dd3 100644 (file)
--- a/cli/cli-trim-unused-textures.script
+++ b/cli/cli-trim-unused-textures.script
@@ -8,7 +8,7 @@ apitrace dump-images --calls=10,31,50,71,87,88 --call-nos=no -o ./glxsimple-ref/
 
 # Trim to the same callset used to generate reference images
 
 
 # Trim to the same callset used to generate reference images
 

-apitrace trim --calls=10,31,50,71,87,88 glxsimple.trace
+apitrace trim --auto --calls=10,31,50,71,87,88 glxsimple.trace

 
 # Verify that we actually trimmed what we wanted to
 
 
 # Verify that we actually trimmed what we wanted to
 

diff --git a/traces/trim-frame-set.script b/traces/trim-frame-set.script
index a6175be098c5b797aed1355ed42b070d2730a806..33293c3c26bde85770d30570ab46ce9b7f106db7 100644 (file)
--- a/traces/trim-frame-set.script
+++ b/traces/trim-frame-set.script
@@ -1,4 +1,4 @@
-trim --frames=0-5/draw,0-5/frame --exact glxsimple.trace
+trim --frames=0-5/draw,0-5/frame glxsimple.trace

 dump --verbose glxsimple-trim.trace
 0 glClear(mask = GL_COLOR_BUFFER_BIT)
 1 glXSwapBuffers(dpy = 0x236a280, drawable = 41943041)
 dump --verbose glxsimple-trim.trace
 0 glClear(mask = GL_COLOR_BUFFER_BIT)
 1 glXSwapBuffers(dpy = 0x236a280, drawable = 41943041)

diff --git a/traces/trim-head-by-frame.script b/traces/trim-head-by-frame.script
index ee5ddb4eab964dfc0ffb4153a6967638544f3d44..64b7eb30682494387ac336171af18fb50c030722 100644 (file)
--- a/traces/trim-head-by-frame.script
+++ b/traces/trim-head-by-frame.script
@@ -1,5 +1,5 @@
-trim --frames=0 glxsimple.trace
-dump --verbose glxsimple-trim.trace
+trim -o trim-head-by-frame.src.trace --auto --frames=0 glxsimple.trace
+dump --verbose trim-head-by-frame.src.trace

 0 glXChooseVisual(dpy = 0x236a280, screen = 0, attribList = {GLX_RGBA, GLX_RED_SIZE, GLX_RED_SIZE, GLX_GREEN_SIZE, GLX_RED_SIZE, GLX_BLUE_SIZE, GLX_RED_SIZE, GLX_ALPHA_SIZE, GLX_RED_SIZE, GLX_DOUBLEBUFFER, GLX_DEPTH_SIZE, 24, GLX_STENCIL_SIZE, GLX_RED_SIZE, GLX_X_VISUAL_TYPE, GLX_DIRECT_COLOR, 0}) = &{visual = 0x2374ef8, visualid = 34, screen = 0, depth = 24, c_class = 5, red_mask = 16711680, green_mask = 65280, blue_mask = 255, colormap_size = 256, bits_per_rgb = 8}
 1 glXCreateContext(dpy = 0x236a280, vis = &{visual = 0x2374ef8, visualid = 34, screen = 0, depth = 24, c_class = 5, red_mask = 16711680, green_mask = 65280, blue_mask = 255, colormap_size = 256, bits_per_rgb = 8}, shareList = NULL, direct = True) = 0x2384330
 2 glXMakeCurrent(dpy = 0x236a280, drawable = 41943041, ctx = 0x2384330) = True
 0 glXChooseVisual(dpy = 0x236a280, screen = 0, attribList = {GLX_RGBA, GLX_RED_SIZE, GLX_RED_SIZE, GLX_GREEN_SIZE, GLX_RED_SIZE, GLX_BLUE_SIZE, GLX_RED_SIZE, GLX_ALPHA_SIZE, GLX_RED_SIZE, GLX_DOUBLEBUFFER, GLX_DEPTH_SIZE, 24, GLX_STENCIL_SIZE, GLX_RED_SIZE, GLX_X_VISUAL_TYPE, GLX_DIRECT_COLOR, 0}) = &{visual = 0x2374ef8, visualid = 34, screen = 0, depth = 24, c_class = 5, red_mask = 16711680, green_mask = 65280, blue_mask = 255, colormap_size = 256, bits_per_rgb = 8}
 1 glXCreateContext(dpy = 0x236a280, vis = &{visual = 0x2374ef8, visualid = 34, screen = 0, depth = 24, c_class = 5, red_mask = 16711680, green_mask = 65280, blue_mask = 255, colormap_size = 256, bits_per_rgb = 8}, shareList = NULL, direct = True) = 0x2384330
 2 glXMakeCurrent(dpy = 0x236a280, drawable = 41943041, ctx = 0x2384330) = True

diff --git a/traces/trim-head.script b/traces/trim-head.script
index 70e8ef5543cd344a07fb5c9784e27cdbda598dc9..897e4e9bb8fd76de8eaa043b51a8a3f893845666 100644 (file)
--- a/traces/trim-head.script
+++ b/traces/trim-head.script
@@ -1,5 +1,5 @@
-trim --calls=0-843 glxsimple.trace
-dump --verbose glxsimple-trim.trace
+trim -o trim-head.src.trace --auto --calls=0-843 glxsimple.trace
+dump --verbose trim-head.src.trace

 0 glXChooseVisual(dpy = 0x236a280, screen = 0, attribList = {GLX_RGBA, GLX_RED_SIZE, GLX_RED_SIZE, GLX_GREEN_SIZE, GLX_RED_SIZE, GLX_BLUE_SIZE, GLX_RED_SIZE, GLX_ALPHA_SIZE, GLX_RED_SIZE, GLX_DOUBLEBUFFER, GLX_DEPTH_SIZE, 24, GLX_STENCIL_SIZE, GLX_RED_SIZE, GLX_X_VISUAL_TYPE, GLX_DIRECT_COLOR, 0}) = &{visual = 0x2374ef8, visualid = 34, screen = 0, depth = 24, c_class = 5, red_mask = 16711680, green_mask = 65280, blue_mask = 255, colormap_size = 256, bits_per_rgb = 8}
 1 glXCreateContext(dpy = 0x236a280, vis = &{visual = 0x2374ef8, visualid = 34, screen = 0, depth = 24, c_class = 5, red_mask = 16711680, green_mask = 65280, blue_mask = 255, colormap_size = 256, bits_per_rgb = 8}, shareList = NULL, direct = True) = 0x2384330
 2 glXMakeCurrent(dpy = 0x236a280, drawable = 41943041, ctx = 0x2384330) = True
 0 glXChooseVisual(dpy = 0x236a280, screen = 0, attribList = {GLX_RGBA, GLX_RED_SIZE, GLX_RED_SIZE, GLX_GREEN_SIZE, GLX_RED_SIZE, GLX_BLUE_SIZE, GLX_RED_SIZE, GLX_ALPHA_SIZE, GLX_RED_SIZE, GLX_DOUBLEBUFFER, GLX_DEPTH_SIZE, 24, GLX_STENCIL_SIZE, GLX_RED_SIZE, GLX_X_VISUAL_TYPE, GLX_DIRECT_COLOR, 0}) = &{visual = 0x2374ef8, visualid = 34, screen = 0, depth = 24, c_class = 5, red_mask = 16711680, green_mask = 65280, blue_mask = 255, colormap_size = 256, bits_per_rgb = 8}
 1 glXCreateContext(dpy = 0x236a280, vis = &{visual = 0x2374ef8, visualid = 34, screen = 0, depth = 24, c_class = 5, red_mask = 16711680, green_mask = 65280, blue_mask = 255, colormap_size = 256, bits_per_rgb = 8}, shareList = NULL, direct = True) = 0x2384330
 2 glXMakeCurrent(dpy = 0x236a280, drawable = 41943041, ctx = 0x2384330) = True

diff --git a/trim_stress_driver.py b/trim_stress_driver.py
index 5b10f146acfd025590cf5b6dc655200f205a50aa..64863f82f0ba2b24b252d7f3ee1daf190cdb4cba 100644 (file)
--- a/trim_stress_driver.py
+++ b/trim_stress_driver.py
@@ -22,7 +22,7 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 

-'''Stress test driver for apitrace trimp.'''
+'''Stress test driver for apitrace trim.'''

 
 import os, errno, shutil, subprocess
 
 
 import os, errno, shutil, subprocess
 


@@ -68,7 +68,7 @@ class TrimStressDriver(Driver):
 
         for frame in range(frames):
             try:
 
         for frame in range(frames):
             try:

-                subprocess.check_call([self.options.apitrace, "trim", "--frame=%d" % (frame), "--output=" + trim_file, trace_file])
+                subprocess.check_call([self.options.apitrace, "trim", "--auto", "--frame=%d" % (frame), "--output=" + trim_file, trace_file])

             except:
                 print "An error occurred while trimming frame %d from %s" % (frame, trace_file)
                 fail()
             except:
                 print "An error occurred while trimming frame %d from %s" % (frame, trace_file)
                 fail()