Changeset 3969

Timestamp:

Aug 7, 2014, 4:40:07 PM (5 years ago)

Author:

daled

Message:

A change to the way unicode categories are handled. This version supports the unicode categlry 'Nd'.

Location:

icGREP/icgrep-devel/icgrep

Files:

• categories_Nd.h (added)
• icgrep.cpp (modified) (4 diffs)
• icgrep.h (modified) (1 diff)
• llvm_gen.cpp (modified) (5 diffs)
• llvm_gen.h (modified) (3 diffs)
• unicode_categories.cpp (modified) (3 diffs)
• unicode_categories.h (modified) (2 diffs)

icGREP/icgrep-devel/icgrep/icgrep.cpp

@@ -50 +50 @@
 BitBlock EOF_mask = simd<1>::constant<1>();
 
+Nd* mNd = NULL;
+
 struct Output {
     BitBlock matches;
@@ -56 +58 @@
 
 /*
-
 struct Basis_bits {
     BitBlock bit_0;
@@ -76 +77 @@
 
 void do_process(FILE *infile, FILE *outfile, int count_only_option, int carry_count, process_block_fcn process_block);
+BitBlock get_category(Basis_bits &basis_bits, const char* category);
 
 int main(int argc, char *argv[])
@@ -433 +435 @@
 
 
-

icGREP/icgrep-devel/icgrep/icgrep.h

@@ -9 +9 @@
 
 
+
 #include <simd-lib/bitblock.hpp>
 #include <simd-lib/carryQ.hpp>
 #include <simd-lib/pabloSupport.hpp>
+
 
 

icGREP/icgrep-devel/icgrep/llvm_gen.cpp

@@ -8 +8 @@
 #include "printer_pablos.h"
 
+Nd nd;
+
 extern "C" {
   void wrapped_print_register(BitBlock bit_block) {
@@ -15 +17 @@
 
 extern "C" {
-    BitBlock wrapped_get_unicode_category(Basis_bits &basis_bits, const char* name){
-        return Unicode_Categories::getCategory(basis_bits, name);
-    }
-}
-
-BitBlock LLVM_Generator::Get_UnicodeCategory(Basis_bits &basis_bits, const char *name)
-{
-    return Unicode_Categories::getCategory(basis_bits, name);
-}
-
-void LLVM_Generator::Print_Register(char *name, BitBlock bit_block)
-{
-    print_register<BitBlock>(name, bit_block);
+    BitBlock wrapped_get_category_Nd(Basis_bits &basis_bits, const char* name){
+
+        Struct_Nd nd_output;
+        nd.do_block(basis_bits, nd_output);
+
+        return nd_output.cc;
+    }
 }
 
@@ -202 +198 @@
 void LLVM_Generator::DeclareFunctions()
 {
-    mFunc_get_unicode_category = mMod->getOrInsertFunction("wrapped_get_unicode_category", m64x2Vect, mStruct_Basis_Bits_Ptr1, Type::getInt8PtrTy(mMod->getContext()), NULL);
-    mExecutionEngine->addGlobalMapping(cast<GlobalValue>(mFunc_get_unicode_category), (void *)&wrapped_get_unicode_category);
+    mFunc_get_unicode_category_Nd = mMod->getOrInsertFunction("wrapped_get_category_Nd", m64x2Vect, mStruct_Basis_Bits_Ptr1, Type::getInt8PtrTy(mMod->getContext()), NULL);
+    mExecutionEngine->addGlobalMapping(cast<GlobalValue>(mFunc_get_unicode_category_Nd), (void *)&wrapped_get_category_Nd);
+
+    //mFunc_get_unicode_category = mMod->getOrInsertFunction("wrapped_get_unicode_category", m64x2Vect, mStruct_Basis_Bits_Ptr1, Type::getInt8PtrTy(mMod->getContext()), NULL);
+    //mExecutionEngine->addGlobalMapping(cast<GlobalValue>(mFunc_get_unicode_category), (void *)&wrapped_get_unicode_category);
 
     //This function can be used for testing to print the contents of a register from JIT'd code to the terminal window.
@@ -414 +413 @@
         {
             Value* basis_bits_struct = b.CreateLoad(mPtr_basis_bits_addr);
-            Value* unicode_category = b.CreateCall2(mFunc_get_unicode_category, basis_bits_struct, b.CreateGlobalStringPtr(call->getCallee()));
+            Value* unicode_category = b.CreateCall2(mFunc_get_unicode_category_Nd, basis_bits_struct, b.CreateGlobalStringPtr(call->getCallee()));
+            //b.CreateCall(mFunc_print_register, unicode_category);
             Value* ptr = b.CreateAlloca(m64x2Vect);
             Value* void_1 = b.CreateStore(unicode_category, ptr);
@@ -422 +422 @@
         std::map<std::string, Value*>::iterator itGet = mMarkerMap.find(call->getCallee());
         Value * var_value = b.CreateLoad(itGet->second);
+
 
         retVal = var_value;

icGREP/icgrep-devel/icgrep/llvm_gen.h

@@ -39 +39 @@
 
 #include "cc_codegenobject.h"
+
 #include "pbix_compiler.h"
 
 #include "llvm_gen_helper.h"
 
-#include "unicode_categories.h"
+//TODO: Remove
+//#include "unicode_categories.h"
+
+#include "categories_Nd.h"
+
 
 #include <iostream>
@@ -106 +111 @@
                                     CodeGenState subexpression_cg_state,
                                     std::list<PabloS*> cc_cgo);
-    void Print_Register(char* name, BitBlock bit_block);
-    BitBlock Get_UnicodeCategory(Basis_bits &basis_bits, const char* name);
 private:
     void MakeLLVMModule();
@@ -154 +157 @@
     Constant*     mFunc_test_getCategory;
     Constant*     mFunc_get_unicode_category;
+    Constant*     mFunc_get_unicode_category_Nd;
 
     AllocaInst*  mPtr_basis_bits_addr;

icGREP/icgrep-devel/icgrep/unicode_categories.cpp

@@ -1 +1 @@
 #include "unicode_categories.h"
+
+Unicode_Categories::Unicode_Categories(){}
 
 BitBlock Unicode_Categories::getCategory(Basis_bits &basis_bits, const char* category)
 {
+    if (std::strcmp(category, "Cc") == 0)
+    {
+        /*
+        Cc cc;
+        Struct_Cc cc_output;
+        cc.do_block(basis_bits, cc_output);
 
-    /*
-    if (category == "Lu")
+        return cc_output.cc;
+        */
+    }
+    else if (std::strcmp(category, "Lu") == 0)
     {
+        /*
         Lu lu;
         Struct_Lu lu_output;
@@ -12 +23 @@
 
         return lu_output.cc;
+        */
     }
-    else if (std::strcmp(category,"Cc\n") != 0)
+    else if (std::strcmp(category, "Nd") == 0)
     {
-        Cc cc;
-        Struct_Cc cc_output;
-        cc.do_block(basis_bits, cc_output);
-
-        return cc_output.cc;
-    }
-    else
-    {
-        std::cout << "Category not implemented yet." << std::endl;
-        BitBlock retVal = simd<1>::constant<0>();
-
-        return retVal;
-    }
-    */
-
-    if (std::strcmp(category, "Cc\n") != 0)
-    {
-        //Cc cc;
-        //Struct_Cc cc_output;
-        //cc.do_block(basis_bits, cc_output);
-
-        //return cc_output.cc;
-    }
-    else if (std::strcmp(category, "Nd\n") !=0)
-    {
+        /*
         Nd nd;
         Struct_Nd nd_output;
@@ -45 +33 @@
 
         return nd_output.cc;
+        */
     }
     else
     {
-        std::cout << "Category not implemented yet." << std::endl;
         BitBlock retVal = simd<1>::constant<0>();
 
         return retVal;
     }
-
 }
 

icGREP/icgrep-devel/icgrep/unicode_categories.h

@@ -2 +2 @@
 #define UNICODE_CATEGORIES_H
 
-//#include "categories_Cc.h"
+#include "categories_Cc.h"
+#include "categories_Lu.h"
 #include "categories_Nd.h"
 
@@ -15 +16 @@
 #include <string>
 
-//BitBlock None = simd<1>::constant<0>();
 
 class Unicode_Categories
 {
 public:
-    //Unicode_Categories();
+    Unicode_Categories();
     static BitBlock getCategory(Basis_bits &basis_bits, const char* category);
 };