From ac5aa5ce65717110a00cfdd67fd4eb47cce01343 Mon Sep 17 00:00:00 2001 From: Paolo Molaro Date: Tue, 10 Apr 2012 17:08:58 +0200 Subject: [PATCH] Revert "Remove MONO_OPT_SCHED; we don't actually use it and it's misleading." This commit breaks binary compatibility for no good reason. This reverts commit cd794a67a600d4ad7db4ebc31273615a4635b445. --- mono/mini/mini.h | 2 +- mono/mini/optflags-def.h | 31 ++++++++++++++++--------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/mono/mini/mini.h b/mono/mini/mini.h index 5023ce34d7c..2a629c39b4a 100644 --- a/mono/mini/mini.h +++ b/mono/mini/mini.h @@ -118,7 +118,7 @@ #endif /* Version number of the AOT file format */ -#define MONO_AOT_FILE_VERSION 83 +#define MONO_AOT_FILE_VERSION 82 //TODO: This is x86/amd64 specific. #define mono_simd_shuffle_mask(a,b,c,d) ((a) | ((b) << 2) | ((c) << 4) | ((d) << 6)) diff --git a/mono/mini/optflags-def.h b/mono/mini/optflags-def.h index 82ec442482f..e0333ea4560 100644 --- a/mono/mini/optflags-def.h +++ b/mono/mini/optflags-def.h @@ -8,18 +8,19 @@ OPTFLAG(DEADCE ,6, "deadce", "Dead code elimination") OPTFLAG(LINEARS ,7, "linears", "Linear scan global reg allocation") OPTFLAG(CMOV ,8, "cmov", "Conditional moves") OPTFLAG(SHARED ,9, "shared", "Emit per-domain code") -OPTFLAG(INTRINS ,10, "intrins", "Intrinsic method implementations") -OPTFLAG(TAILC ,11, "tailc", "Tail recursion and tail calls") -OPTFLAG(LOOP ,12, "loop", "Loop related optimizations") -OPTFLAG(FCMOV ,13, "fcmov", "Fast x86 FP compares") -OPTFLAG(LEAF ,14, "leaf", "Leaf procedures optimizations") -OPTFLAG(AOT ,15, "aot", "Usage of Ahead Of Time compiled code") -OPTFLAG(PRECOMP ,16, "precomp", "Precompile all methods before executing Main") -OPTFLAG(ABCREM ,17, "abcrem", "Array bound checks removal") -OPTFLAG(SSAPRE ,18, "ssapre", "SSA based Partial Redundancy Elimination") -OPTFLAG(EXCEPTION,19, "exception", "Optimize exception catch blocks") -OPTFLAG(SSA ,20, "ssa", "Use plain SSA form") -OPTFLAG(SSE2 ,21, "sse2", "SSE2 instructions on x86") -OPTFLAG(GSHARED ,22, "gshared", "Share generics") -OPTFLAG(SIMD ,23, "simd", "Simd intrinsics") -OPTFLAG(UNSAFE ,24, "unsafe", "Remove bound checks and perform other dangerous changes") +OPTFLAG(SCHED ,10, "sched", "Instruction scheduling") +OPTFLAG(INTRINS ,11, "intrins", "Intrinsic method implementations") +OPTFLAG(TAILC ,12, "tailc", "Tail recursion and tail calls") +OPTFLAG(LOOP ,13, "loop", "Loop related optimizations") +OPTFLAG(FCMOV ,14, "fcmov", "Fast x86 FP compares") +OPTFLAG(LEAF ,15, "leaf", "Leaf procedures optimizations") +OPTFLAG(AOT ,16, "aot", "Usage of Ahead Of Time compiled code") +OPTFLAG(PRECOMP ,17, "precomp", "Precompile all methods before executing Main") +OPTFLAG(ABCREM ,18, "abcrem", "Array bound checks removal") +OPTFLAG(SSAPRE ,19, "ssapre", "SSA based Partial Redundancy Elimination") +OPTFLAG(EXCEPTION,20, "exception", "Optimize exception catch blocks") +OPTFLAG(SSA ,21, "ssa", "Use plain SSA form") +OPTFLAG(SSE2 ,23, "sse2", "SSE2 instructions on x86") +OPTFLAG(GSHARED ,24, "gshared", "Share generics") +OPTFLAG(SIMD ,25, "simd", "Simd intrinsics") +OPTFLAG(UNSAFE ,26, "unsafe", "Remove bound checks and perform other dangerous changes") -- 2.25.1