ICU-8119 fixed, also fixed minor build/test issues.

X-SVN-Rev: 28997

diff --git a/.gitignore b/.gitignore
index bce0932d1f6de2cfad5982397fb529967881908d..8b1bb9cef6dda3c40d9723060411c73e516661f9 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -498,6 +498,7 @@ icu4c/source/test/perf/convperf/debug
 icu4c/source/test/perf/convperf/release
 icu4c/source/test/perf/convperf/x64
 icu4c/source/test/perf/convperf/x86
+icu4c/source/test/perf/ipch
 icu4c/source/test/perf/normperf/*.d
 icu4c/source/test/perf/normperf/*.o
 icu4c/source/test/perf/normperf/*.vcxproj.user

diff --git a/icu4c/source/test/perf/DateFmtPerf/DateFmtPerf.cpp b/icu4c/source/test/perf/DateFmtPerf/DateFmtPerf.cpp
index e463e6e3388772fd71547ad6a3861b0533dfeae6..afb982124430b6052907578878e32b77600f0e91 100644 (file)
--- a/icu4c/source/test/perf/DateFmtPerf/DateFmtPerf.cpp
+++ b/icu4c/source/test/perf/DateFmtPerf/DateFmtPerf.cpp
@@ -111,11 +111,15 @@ UPerfFunction* DateFormatPerfTest::Collation100000(){
 int main(int argc, const char* argv[]){
 
     // -x Filename.xml
-    if(strcmp(argv[1],"-x") == 0)
+    if((argc>1)&&(strcmp(argv[1],"-x") == 0))
     {
-        if(argc < 3) return 0; // not enough arguments
+        if(argc < 3) {
+                       fprintf(stderr, "Usage: %s -x <outfile>.xml\n", argv[0]);
+                       return 1;
+                       // not enough arguments
+               }
 
-           cout << "ICU version - " << U_ICU_VERSION << endl;
+               cout << "ICU version - " << U_ICU_VERSION << endl;
         UErrorCode status = U_ZERO_ERROR;
 
         // Declare functions

diff --git a/icu4c/source/test/perf/DateFmtPerf/DateFmtPerf.h b/icu4c/source/test/perf/DateFmtPerf/DateFmtPerf.h
index 033019aa6ab60225e45c3e477ef81d2dc846a726..8227749491a488cca1f9203c56f97ce584edb02a 100644 (file)
--- a/icu4c/source/test/perf/DateFmtPerf/DateFmtPerf.h
+++ b/icu4c/source/test/perf/DateFmtPerf/DateFmtPerf.h
@@ -361,22 +361,42 @@ class CollationFunction : public UPerfFunction
 private:
        int num;
     char locale[25];
+       UnicodeString *collation_strings;
+
+       /**
+        * Unescape the strings
+        */
+       void init() {
+        uint32_t listSize = sizeof(collation_strings_escaped)/sizeof(collation_strings_escaped[0]);
+               collation_strings = new UnicodeString[listSize];
+               for(uint32_t k=0;k<listSize;k++) {
+                       collation_strings[k] = collation_strings_escaped[k].unescape();
+               }
+               UnicodeString shorty((UChar32)0x12345);
+       }
 public:
        
        CollationFunction()
        {
                num = -1;
+
+               init();
+       }
+
+       ~CollationFunction() {
+               delete [] collation_strings;
        }
 
        CollationFunction(int a, const char* loc)
        {
                num = a;
         strcpy(locale, loc);
+               init();
        }
 
        virtual void call(UErrorCode* status2)
        {
-        uint32_t listSize = sizeof(collation_strings)/sizeof(collation_strings[0]);
+        uint32_t listSize = sizeof(collation_strings_escaped)/sizeof(collation_strings_escaped[0]);
         UErrorCode status = U_ZERO_ERROR; 
         Collator *coll = Collator::createInstance(Locale(locale), status);
         

diff --git a/icu4c/source/test/perf/DateFmtPerf/DateFmtPerf.vcxproj b/icu4c/source/test/perf/DateFmtPerf/DateFmtPerf.vcxproj
index dc2a206f61b9227f4f7d0fde8faa9bb38b4b2f8c..fda711af78f8e3f07955aafcd9a64860d9426075 100644 (file)
--- a/icu4c/source/test/perf/DateFmtPerf/DateFmtPerf.vcxproj
+++ b/icu4c/source/test/perf/DateFmtPerf/DateFmtPerf.vcxproj
@@ -37,10 +37,10 @@
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)\x86\$(Configuration)\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)\x86\$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\x86\$(Configuration)\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>\r
   </PropertyGroup>\r
@@ -55,8 +55,7 @@
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
       <WarningLevel>Level3</WarningLevel>\r
-      <DebugInformationFormat>\r
-      </DebugInformationFormat>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>icuucd.lib;icutud.lib;icutestd.lib;winmm.lib;icuucd.lib;icuind.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
@@ -115,4 +114,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r
-</Project>
+</Project>
\ No newline at end of file

diff --git a/icu4c/source/test/perf/DateFmtPerf/collationdata.h b/icu4c/source/test/perf/DateFmtPerf/collationdata.h
index 3811ca7a94c8ad6bbf0c404ced7e6ac39550ad12..c1e03120da61ca3a5c0218b9fad42e4612f0e013 100644 (file)
--- a/icu4c/source/test/perf/DateFmtPerf/collationdata.h
+++ b/icu4c/source/test/perf/DateFmtPerf/collationdata.h
@@ -9,14 +9,18 @@
 \r
 #include "unicode/ustring.h"\r
 \r
-UnicodeString collation_strings [] = {\r
+/*\r
+ * Processed through '[^\u0000-\u007f] Any-Hex/C' and then \u -> \\\u\r
+ */\r
+\r
+UnicodeString collation_strings_escaped [] = {\r
     "Brenet, Nicolas-Guy",\r
     "Bresdin, Rodolphe",\r
-    "Breton, André",\r
+    "Breton, Andr\\u00E9",\r
     "Breton, Jules",\r
     "Brett, John",\r
-    "Breu the Elder, Jörg",\r
-    "Breu the Younger, Jörg",\r
+    "Breu the Elder, J\\u00F6rg",\r
+    "Breu the Younger, J\\u00F6rg",\r
     "Brewster Jr., John",\r
     "Brewster, Anna Richards",\r
     "Brewtnall, Edward Frederick",\r
@@ -134,7 +138,7 @@ UnicodeString collation_strings [] = {
     "Hall, Harry",\r
     "Hall, John",\r
     "Hall, Pam",\r
-    "Hallé, Edward Charles",\r
+    "Hall\\u00E9, Edward Charles",\r
     "Hallen, Ambrose",\r
     "Halley, Peter",\r
     "Halliday, Edward Irvine",\r
@@ -157,10 +161,10 @@ UnicodeString collation_strings [] = {
     "Meatyard, Ralph Eugene",\r
     "Meckenem, Israhel van",\r
     "Meegan, Tim",\r
-    "Mehoffer, Józef",\r
+    "Mehoffer, J\\u00F3zef",\r
     "Meidias Painter, The",\r
     "Meidner, Ludwig",\r
-    "Meireles de Lima, Vítor",\r
+    "Meireles de Lima, V\\u00EDtor",\r
     "Meissner, Leo J.",\r
     "Meissonier, Jean-Louis-Ernest",\r
     "Meistermann, Georg",\r
@@ -168,7 +172,7 @@ UnicodeString collation_strings [] = {
     "Melchers, Gari",\r
     "Meldrum, Max",\r
     "Meleager Painter, The",\r
-    "Meléndez, Luis Egidio",\r
+    "Mel\\u00E9ndez, Luis Egidio",\r
     "Mellan, Claude",\r
     "Mellery, Xavier",\r
     "Melli, Roberto",\r
@@ -196,16 +200,16 @@ UnicodeString collation_strings [] = {
     "Pei, I.M.",\r
     "Pelham, Peter",\r
     "Pellan, Alfred",\r
-    "Pellegrin, Honoré",\r
+    "Pellegrin, Honor\\u00E9",\r
     "Pellegrini, Domenico",\r
     "Pellegrini, Giovanni Antonio",\r
-    "Pelouse, Léon-Germain",\r
+    "Pelouse, L\\u00E9on-Germain",\r
     "Pels, Marsha",\r
     "Pemberton, Sophie",\r
-    "Peña, Tonita",\r
+    "Pe\\u00F1a, Tonita",\r
     "Penck, A.R.",\r
     "Pencz, Georg",\r
-    "Pène du Bois, Guy",\r
+    "P\\u00E8ne du Bois, Guy",\r
     "Penn, Irving",\r
     "Pennell, Joseph",\r
     "Rosso, Mino",\r
@@ -222,16 +226,16 @@ UnicodeString collation_strings [] = {
     "Rothstein, Arthur",\r
     "Rottenhammer, Hans",\r
     "Rouault, Georges",\r
-    "Roubiliac, Louis-François",\r
+    "Roubiliac, Louis-Fran\\u00E7ois",\r
     "Rouget, Georges",\r
     "Rousseau, Henri",\r
-    "Rousseau, Théodore",\r
+    "Rousseau, Th\\u00E9odore",\r
     "Roussel, Ker Xavier",\r
-    "Roussel, Théodore",\r
+    "Roussel, Th\\u00E9odore",\r
     "Rousselet, Gilles",\r
     "Roux, Ange-Joseph Antoine",\r
-    "Roux, François Geoffroi",\r
-    "Roux, François Joseph Frédéric",\r
+    "Roux, Fran\\u00E7ois Geoffroi",\r
+    "Roux, Fran\\u00E7ois Joseph Fr\\u00E9d\\u00E9ric",\r
     "Roux, Joseph",\r
     "Roux, Louis",\r
     "Roux, Mathieu Antoine",\r
@@ -245,7 +249,7 @@ UnicodeString collation_strings [] = {
     "Rubens, Pete Paul",\r
     "Rubin, Reuven",\r
     "Rublev, Andrei",\r
-    "Rude, François",\r
+    "Rude, Fran\\u00E7ois",\r
     "Rude, Olaf",\r
     "Ruelas, Julio",\r
     "Ruff, Thomas",\r
@@ -260,4 +264,5 @@ UnicodeString collation_strings [] = {
     "Schonfeld, Johann Heinrich",\r
     "Schongauer, Martin",\r
     "Schwieger, C. Robert"\r
-};
\ No newline at end of file
+};\r
+\r

diff --git a/icu4c/source/test/perf/perf.sln b/icu4c/source/test/perf/perf.sln
index a32b6f236404aeb0ef28c91cd589c48b76cc07ae..47f7977f5750c53caa51512d157b623b6adb3a8f 100644 (file)
--- a/icu4c/source/test/perf/perf.sln
+++ b/icu4c/source/test/perf/perf.sln
@@ -26,8 +26,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ucnvavailperf", "ucnvavailp
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DateFmtPerf", "DateFmtPerf\DateFmtPerf.vcxproj", "{B5E59422-0C52-4469-AB69-0C2AFD6E37A5}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dtfmtrtperf", "dtfmrtperf\dtfmtrtperf.vcproj", "{1FCAA83C-955C-4DEF-9CEF-3679AE75C44D}"
-EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
@@ -134,12 +132,6 @@ Global
                {B5E59422-0C52-4469-AB69-0C2AFD6E37A5}.Release|Win32.ActiveCfg = Release|Win32
                {B5E59422-0C52-4469-AB69-0C2AFD6E37A5}.Release|Win32.Build.0 = Release|Win32
                {B5E59422-0C52-4469-AB69-0C2AFD6E37A5}.Release|x64.ActiveCfg = Release|Win32
-               {1FCAA83C-955C-4DEF-9CEF-3679AE75C44D}.Debug|Win32.ActiveCfg = Debug|Win32
-               {1FCAA83C-955C-4DEF-9CEF-3679AE75C44D}.Debug|Win32.Build.0 = Debug|Win32
-               {1FCAA83C-955C-4DEF-9CEF-3679AE75C44D}.Debug|x64.ActiveCfg = Debug|Win32
-               {1FCAA83C-955C-4DEF-9CEF-3679AE75C44D}.Release|Win32.ActiveCfg = Release|Win32
-               {1FCAA83C-955C-4DEF-9CEF-3679AE75C44D}.Release|Win32.Build.0 = Release|Win32
-               {1FCAA83C-955C-4DEF-9CEF-3679AE75C44D}.Release|x64.ActiveCfg = Release|Win32
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE