summaryrefslogtreecommitdiffstats
path: root/tools/perf_expectations
diff options
context:
space:
mode:
authorcmp@chromium.org <cmp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-07 18:43:45 +0000
committercmp@chromium.org <cmp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-07 18:43:45 +0000
commit60b9e4408a0dc381828631face4113cfffb7e76f (patch)
treec37a8193181e6fbdff3355d33b66e1b51639b53b /tools/perf_expectations
parent4b559fd04054ca154d64b6462b4c9cf476952556 (diff)
downloadchromium_src-60b9e4408a0dc381828631face4113cfffb7e76f.zip
chromium_src-60b9e4408a0dc381828631face4113cfffb7e76f.tar.gz
chromium_src-60b9e4408a0dc381828631face4113cfffb7e76f.tar.bz2
Revert "Make make_expectations allow floating point values..."
This reverts commit r103363. This breaks some basic assumptions in the script and the expectations file dealing with numeric->string and string->numeric conversion. TBR=jvoung@chromium.org Review URL: http://codereview.chromium.org/8186005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104531 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/perf_expectations')
-rwxr-xr-xtools/perf_expectations/make_expectations.py26
1 files changed, 4 insertions, 22 deletions
diff --git a/tools/perf_expectations/make_expectations.py b/tools/perf_expectations/make_expectations.py
index 86929b4..f73383d 100755
--- a/tools/perf_expectations/make_expectations.py
+++ b/tools/perf_expectations/make_expectations.py
@@ -267,12 +267,6 @@ def Main(args):
regress = float(trace_values[tracename]['high'])
improve = float(trace_values[tracename]['low'])
- # Check if we started with round integers so we can keep them
- # integers in the end.
- bounds_were_integers = False
- if regress == int(regress) and improve == int(improve):
- bounds_were_integers = True
-
# At this point, regress > improve. If regress == improve, we adjust
# improve so it is just a little less than regress. I'm picking on improve
# so we keep the sizes assumptions in place for now.
@@ -288,23 +282,11 @@ def Main(args):
regress = improve
improve = temp
if regress < improve:
- regress = regress - abs(regress*tolerance)
- improve = improve + abs(improve*tolerance)
- if bounds_were_integers:
- regress = '%d' % int(math.floor(regress))
- improve = '%d' % int(math.ceil(improve))
- else:
- regress = '%.4f' % regress
- improve = '%.4f' % improve
+ regress = int(math.floor(regress - abs(regress*tolerance)))
+ improve = int(math.ceil(improve + abs(improve*tolerance)))
else:
- improve = improve - abs(improve*tolerance)
- regress = regress + abs(regress*tolerance)
- if bounds_were_integers:
- improve = '%d' % int(math.floor(improve))
- regress = '%d' % int(math.ceil(regress))
- else:
- regress = '%.4f' % regress
- improve = '%.4f' % improve
+ improve = int(math.floor(improve - abs(improve*tolerance)))
+ regress = int(math.ceil(regress + abs(regress*tolerance)))
# Calculate the new checksum to test if this is the only thing that may have
# changed.