From 9861375f0c1235ea25f68211f3a82f6dcd91874c Mon Sep 17 00:00:00 2001
From: Evghenii <egaburov@dds.nl>
Date: Fri, 13 Sep 2013 15:07:14 +0200
Subject: [PATCH] renamed avx-i64x4 -> avx1-i64x4

---
 Makefile                                                      | 2 +-
 builtins.cpp                                                  | 4 ++--
 builtins/{target-avx-i64x4.ll => target-avx1-i64x4.ll}        | 2 +-
 .../{target-avx-i64x4base.ll => target-avx1-i64x4base.ll}     | 0
 ispc.cpp                                                      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename builtins/{target-avx-i64x4.ll => target-avx1-i64x4.ll} (98%)
 rename builtins/{target-avx-i64x4base.ll => target-avx1-i64x4base.ll} (100%)

diff --git a/Makefile b/Makefile
index 92debe4f..097da238 100644
--- a/Makefile
+++ b/Makefile
@@ -141,7 +141,7 @@ CXX_SRC=ast.cpp builtins.cpp cbackend.cpp ctx.cpp decl.cpp expr.cpp func.cpp \
 	type.cpp util.cpp
 HEADERS=ast.h builtins.h ctx.h decl.h expr.h func.h ispc.h llvmutil.h module.h \
 	opt.h stmt.h sym.h type.h util.h
-TARGETS=avx-i64x4 avx1 avx1-x2 avx11 avx11-x2 avx2 avx2-x2 \
+TARGETS=avx1-i64x4 avx1 avx1-x2 avx11 avx11-x2 avx2 avx2-x2 \
 	sse2 sse2-x2 sse4-8 sse4-16 sse4 sse4-x2 \
 	generic-4 generic-8 generic-16 generic-32 generic-64 generic-1
 ifneq ($(ARM_ENABLED), 0)
diff --git a/builtins.cpp b/builtins.cpp
index f8d4136e..43f68833 100644
--- a/builtins.cpp
+++ b/builtins.cpp
@@ -937,10 +937,10 @@ DefineStdlib(SymbolTable *symbolTable, llvm::LLVMContext *ctx, llvm::Module *mod
         switch (g->target->getVectorWidth()) {
         case 4:
             if (runtime32) {
-                EXPORT_MODULE(builtins_bitcode_avx_i64x4_32bit);
+                EXPORT_MODULE(builtins_bitcode_avx1_i64x4_32bit);
             }
             else {
-                EXPORT_MODULE(builtins_bitcode_avx_i64x4_64bit);
+                EXPORT_MODULE(builtins_bitcode_avx1_i64x4_64bit);
             }
             break;
         case 8:
diff --git a/builtins/target-avx-i64x4.ll b/builtins/target-avx1-i64x4.ll
similarity index 98%
rename from builtins/target-avx-i64x4.ll
rename to builtins/target-avx1-i64x4.ll
index 65490ea5..d183f1ce 100644
--- a/builtins/target-avx-i64x4.ll
+++ b/builtins/target-avx1-i64x4.ll
@@ -29,7 +29,7 @@
 ;;   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 ;;   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
 
-include(`target-avx-i64x4base.ll')
+include(`target-avx1-i64x4base.ll')
 
 rdrand_decls()
 
diff --git a/builtins/target-avx-i64x4base.ll b/builtins/target-avx1-i64x4base.ll
similarity index 100%
rename from builtins/target-avx-i64x4base.ll
rename to builtins/target-avx1-i64x4base.ll
diff --git a/ispc.cpp b/ispc.cpp
index 1a99154b..26ca0b39 100644
--- a/ispc.cpp
+++ b/ispc.cpp
@@ -446,7 +446,7 @@ Target::Target(const char *arch, const char *cpu, const char *isa, bool pic) :
         this->m_maskingIsFree = false;
         this->m_maskBitCount = 32;
     }
-    else if (!strcasecmp(isa, "avx-i64x4") ) {
+    else if (!strcasecmp(isa, "avx1-i64x4") ) {
         this->m_isa = Target::AVX;
         this->m_nativeVectorWidth = 8;  /* native vector width in terms of floats */
         this->m_vectorWidth = 4;