Merge pull request #3 from sdu-hpcl/name-bug-fix

variable name bug fix
sdu-hpcl · Feb 24, 2022 · dffcf9e · dffcf9e
2 parents 358997a + e80aefa
commit dffcf9e
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+.DS_Store
diff --git a/generator/.gitignore b/generator/.gitignore
@@ -0,0 +1 @@
+*.iml
diff --git a/generator/generator.jar b/generator/generator.jar
diff --git a/generator/source/pom.xml b/generator/source/pom.xml
@@ -35,10 +35,9 @@
  <dependency>
  <groupId>org.projectlombok</groupId>
  <artifactId>lombok</artifactId>
- <version>1.16.18</version>
+ <version>1.18.22</version>
  <scope>provided</scope>
  </dependency>
-
  </dependencies>
 
  <build>

diff --git a/generator/source/src/main/java/org/sduhpcl/bgsa/arch/SIMDArch.java b/generator/source/src/main/java/org/sduhpcl/bgsa/arch/SIMDArch.java
@@ -1,14 +1,14 @@
 package org.sduhpcl.bgsa.arch;
 
-import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
-import org.sduhpcl.bgsa.intrinsics.BaseIntrinsics;
-import org.sduhpcl.bgsa.generator.BaseGenerator;
-
 import java.lang.reflect.Field;
 import java.util.Map;
 
+import org.sduhpcl.bgsa.generator.BaseGenerator;
+import org.sduhpcl.bgsa.intrinsics.BaseIntrinsics;
+
+import lombok.Getter;
+import lombok.Setter;
+
 /**
  *
  * @author zhangjikai

diff --git a/generator/source/src/main/java/org/sduhpcl/bgsa/generator/BandedMyersGenerator.java b/generator/source/src/main/java/org/sduhpcl/bgsa/generator/BandedMyersGenerator.java
@@ -1,10 +1,8 @@
 package org.sduhpcl.bgsa.generator;
 
 import org.sduhpcl.bgsa.arch.SIMDArch;
-import org.sduhpcl.bgsa.arch.SSEArch;
 import org.sduhpcl.bgsa.util.Constants;
 import org.sduhpcl.bgsa.util.FileUtils;
-import sun.reflect.misc.FieldUtil;
 
 /**
  * @author Jikai Zhang

diff --git a/generator/source/src/main/java/org/sduhpcl/bgsa/generator/BitPAlGenerator.java b/generator/source/src/main/java/org/sduhpcl/bgsa/generator/BitPAlGenerator.java
@@ -154,7 +154,7 @@ public void genPackedCommon() {
  String compDhMin2Mid = "comp_dh_" + getNumberName(minValue) + "_to_" + getNumberName(midValue);
  String dhMin2Mid = "dh_" + getNumberName(minValue) + "_to_" + getNumberName(midValue);
  String dhMaxOrMatch = getFieldName(maxValue, "dh_", "_or_match");
- String dvNotMax2MidOrMatch = "dvnot" + maxValue + "to" + (midValue + 1) + "ormatch";
+ String dvNotMax2MidOrMatch = "dvnot" + getNumberName(maxValue) + "to" + getNumberName(midValue + 1) + "ormatch";
  String dvMaxShiftOrMatch = getFieldName(maxValue, "dv", "shiftormatch");
 
 
@@ -539,7 +539,7 @@ private void genPackedCarry() {
  String compDhMin2Mid = "comp_dh_" + getNumberName(minValue) + "_to_" + getNumberName(midValue);
  String dhMin2Mid = "dh_" + getNumberName(minValue) + "_to_" + getNumberName(midValue);
  String dhMaxOrMatch = getFieldName(maxValue, "dh_", "_or_match");
- String dvNotMax2MidOrMatch = "dvnot" + maxValue + "to" + (midValue + 1) + "ormatch";
+ String dvNotMax2MidOrMatch = "dvnot" + getNumberName(maxValue) + "to" + getNumberName(midValue + 1) + "ormatch";
  String dvMaxShiftOrMatch = getFieldName(maxValue, "dv", "shiftormatch");
 
  List<String> strList = new ArrayList<>();
@@ -1066,7 +1066,7 @@ public void genUnpackedCarry() {
  String remainDHMin = getFieldName(minValue, "remain_dh", "");
  String dhMin2Mid = "dh" + getNumberName(minValue) + "to" + getNumberName(midValue);
  String dhMaxOrMatch = getFieldName(maxValue, "dh", "ormatch");
- String dvNotMax2MidOrMatch = "dvnot" + maxValue + "to" + (midValue) + "ormatch";
+ String dvNotMax2MidOrMatch = "dvnot" + getNumberName(maxValue) + "to" + getNumberName(midValue) + "ormatch";
  String dvMaxShiftOrMatch = getFieldName(maxValue, "dv", "shiftormatch");
  List<String> strList = new ArrayList<>();
  int index = 1;
@@ -1395,7 +1395,7 @@ public void genUnpackedCommon() {
  String remainDHMin = getFieldName(minValue, "remain_dh", "");
  String dhMin2Mid = "dh" + getNumberName(minValue) + "to" + getNumberName(midValue);
  String dhMaxOrMatch = getFieldName(maxValue, "dh", "ormatch");
- String dvNotMax2MidOrMatch = "dvnot" + maxValue + "to" + (midValue) + "ormatch";
+ String dvNotMax2MidOrMatch = "dvnot" + getNumberName(maxValue) + "to" + getNumberName(midValue) + "ormatch";
  String dvMaxShiftOrMatch = getFieldName(maxValue, "dv", "shiftormatch");
  List<String> strList = new ArrayList<>();
  int index = 1;
@@ -1774,7 +1774,7 @@ public void genEditCarry() {
  String remainDHMin = getFieldName(minValue, "remain_dh", "");
  String dhMin2Mid = "dh" + getNumberName(minValue) + "to" + getNumberName(midValue);
  String dhMaxOrMatch = getFieldName(maxValue, "dh", "ormatch");
- String dvNotMax2MidOrMatch = "dvnot" + maxValue + "to" + (midValue) + "ormatch";
+ String dvNotMax2MidOrMatch = "dvnot" + getNumberName(maxValue) + "to" + getNumberName(midValue) + "ormatch";
  String dvMaxShiftOrMatch = getFieldName(maxValue, "dv", "shiftormatch");
 
  fileUtils.setMarignLeft(0);
@@ -1973,7 +1973,7 @@ public void genEditCommon() {
  String remainDHMin = getFieldName(minValue, "remain_dh", "");
  String dhMin2Mid = "dh" + getNumberName(minValue) + "to" + getNumberName(midValue);
  String dhMaxOrMatch = getFieldName(maxValue, "dh", "ormatch");
- String dvNotMax2MidOrMatch = "dvnot" + maxValue + "to" + (midValue) + "ormatch";
+ String dvNotMax2MidOrMatch = "dvnot" + getNumberName(maxValue) + "to" + getNumberName(midValue) + "ormatch";
  String dvMaxShiftOrMatch = getFieldName(maxValue, "dv", "shiftormatch");
 
  fileUtils.setMarignLeft(0);
@@ -2337,7 +2337,7 @@ private void calcDhValues() {
  private String getDvName(int value) {
  String string = null;
  if (value == midValue) {
- string = "dvnot" + maxValue + "to" + (midValue + 1) + "ormatch";
+ string = "dvnot" + getNumberName(maxValue) + "to" + getNumberName(midValue + 1) + "ormatch";
  } else if (value == maxValue) {
  string = "dv" + getNumberName(value) + "shiftormatch";
  } else {