[Compbench-devel] CompBenchmarks++/libcompbenchmarks/share/KB/gxx/2.95.x description.xml, 1.1, 1.2

[Frederic T. <xf...@us...>]

Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/share/KB/gxx/2.95.x
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv27335

Modified Files:
	description.xml 
Log Message:
CEL obsoleted.
Logic is integrated within descriptions.

Index: description.xml
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/share/KB/gxx/2.95.x/description.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** description.xml	20 Mar 2007 20:33:16 -0000	1.1
--- description.xml	11 Apr 2007 20:22:29 -0000	1.2
***************
*** 17,21 ****
  
  <options>
! 
   <option id="O0">
    <value>-O0</value>
--- 17,23 ----
  
  <options>
! <!--
!  <include file="common/common.xml" type="cel"/>
! -->
   <option id="O0">
    <value>-O0</value>
***************
*** 24,27 ****
--- 26,32 ----
     Do not optimize. This is the default
    </editor-description>
+   <logic>
+    <logic-option-exclusive on="kb-option-mainoptimization"/>
+   </logic>
   </option>
  
***************
*** 41,44 ****
--- 46,53 ----
     such option is the one that is effective.
    </editor-description>
+   <logic>
+    <logic-option-exclusive on="kb-option-mainoptimization"/>
+    <logic-flag-set id="alignment-disabled" value="1"/>
+   </logic>
   </option>
  
***************
*** 72,75 ****
--- 81,88 ----
     other flags may also be turned on.
    </editor-description>
+   <logic>
+    <logic-option-exclusive on="kb-option-mainoptimization"/>
+    <logic-flag-set id="alignment-disabled" value="0"/>
+   </logic>
   </option>
    
***************
*** 84,87 ****
--- 97,103 ----
     generated code.
    </editor-description>
+   <logic>
+    <logic-option-exclusive on="kb-option-mainoptimization"/>
+   </logic>
   </option>
  
***************
*** 93,96 ****
--- 109,115 ----
     turning on -finline-functions.
    </editor-description>
+   <logic>
+    <logic-option-exclusive on="kb-option-mainoptimization"/>
+   </logic>
   </option>
  
***************
*** 120,123 ****
--- 139,146 ----
     is false.
    </editor-description>
+   <logic>
+    <logic-option-implied-by id="O2"/>
+    <logic-option-implied-by id="O3"/>
+   </logic>
   </option>
  
***************
*** 132,135 ****
--- 155,162 ----
     body of the if.
    </editor-description>
+   <logic>
+    <logic-option-implied-by id="O2"/>
+    <logic-option-implied-by id="O3"/>
+   </logic>
   </option>
  
***************
*** 142,145 ****
--- 169,176 ----
     branch instructions.
    </editor-description>
+   <logic>
+    <logic-option-implied-by id="O2"/>
+    <logic-option-implied-by id="O3"/>
+   </logic>
   </option>
  
***************
*** 150,156 ****
     Perform a number of minor optimizations that are relatively expensive.
    </editor-description>
   </option>
  
- 
   <option id="fast-math">
    <value>-ffast-math</value>
--- 181,190 ----
     Perform a number of minor optimizations that are relatively expensive.
    </editor-description>
+   <logic>
+    <logic-option-implied-by id="O2"/>
+    <logic-option-implied-by id="O3"/>
+   </logic>
   </option>
  
   <option id="fast-math">
    <value>-ffast-math</value>
***************
*** 182,185 ****
--- 216,223 ----
      point.  Use `-ffloat-store' for such programs.
    </editor-description>
+   <logic>
+    <logic-option-implied-by id="O2"/>
+    <logic-option-implied-by id="O3"/>
+   </logic>
   </option>
  
***************
*** 193,196 ****
--- 231,238 ----
     difference this makes.
    </editor-description>
+   <logic>
+    <logic-option-implied-by id="O2"/>
+    <logic-option-implied-by id="O3"/>
+   </logic>
   </option>
  
***************
*** 206,209 ****
--- 248,255 ----
     about the difference this makes.
    </editor-description>
+   <logic>
+    <logic-option-implied-by id="O2"/>
+    <logic-option-implied-by id="O3"/>
+   </logic>
   </option>
  
***************
*** 220,223 ****
--- 266,272 ----
     function as assembler code in its own right.
    </editor-description>
+   <logic>
+    <logic-option-implied-by id="O3"/>
+   </logic>
   </option>
  
***************
*** 247,250 ****
--- 296,303 ----
     has been performed.
    </editor-description>
+   <logic>
+    <logic-option-implied-by id="O2"/>
+    <logic-option-implied-by id="O3"/>
+   </logic>
   </option>
  
***************
*** 260,263 ****
--- 313,320 ----
     is required.
    </editor-description>
+   <logic>
+    <logic-option-implied-by id="O2"/>
+    <logic-option-implied-by id="O3"/>
+   </logic>
   </option>
  
***************
*** 272,275 ****
--- 329,336 ----
     take more than one cycle.
    </editor-description>
+   <logic>
+    <logic-option-implied-by id="O2"/>
+    <logic-option-implied-by id="O3"/>
+   </logic>
   </option>
  
***************
*** 281,284 ****
--- 342,349 ----
     elimination of iteration variables.
    </editor-description>
+   <logic>
+    <logic-option-implied-by id="O2"/>
+    <logic-option-implied-by id="O3"/>
+   </logic>
   </option>
  
***************
*** 294,297 ****
--- 359,366 ----
     false.
    </editor-description>
+   <logic>
+    <logic-option-implied-by id="O2"/>
+    <logic-option-implied-by id="O3"/>
+   </logic>
   </option>