Skip to content

arm: Fix clang compilation for ARMv7 #1226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xianyi merged 1 commit into from
Jul 10, 2017
Merged

arm: Fix clang compilation for ARMv7 #1226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions kernel/arm/axpy_vfp.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,14 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#if defined(DOUBLE)

#define FMAC_R1 fmacd
#define FMAC_R2 fnmacd
#define FMAC_R2 vmls.f64
#define FMAC_I1 fmacd
#define FMAC_I2 fmacd

#else

#define FMAC_R1 fmacs
#define FMAC_R2 fnmacs
#define FMAC_R2 vmls.f32
#define FMAC_I1 fmacs
#define FMAC_I2 fmacs

Expand All @@ -90,14 +90,14 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

#define FMAC_R1 fmacd
#define FMAC_R2 fmacd
#define FMAC_I1 fnmacd
#define FMAC_I1 vmls.f64
#define FMAC_I2 fmacd

#else

#define FMAC_R1 fmacs
#define FMAC_R2 fmacs
#define FMAC_I1 fnmacs
#define FMAC_I1 vmls.f32
#define FMAC_I2 fmacs

#endif
Expand Down
16 changes: 8 additions & 8 deletions kernel/arm/cgemm_kernel_2x2_vfp.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,42 +94,42 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

#if defined(NN) || defined(NT) || defined(TN) || defined(TT)

#define KMAC_R fnmacs
#define KMAC_R vmls.f32
#define KMAC_I fmacs

#define FMAC_R1 fmacs
#define FMAC_R2 fnmacs
#define FMAC_R2 vmls.f32
#define FMAC_I1 fmacs
#define FMAC_I2 fmacs

#elif defined(CN) || defined(CT)

#define KMAC_R fmacs
#define KMAC_I fnmacs
#define KMAC_I vmls.f32

#define FMAC_R1 fmacs
#define FMAC_R2 fnmacs
#define FMAC_R2 vmls.f32
#define FMAC_I1 fmacs
#define FMAC_I2 fmacs

#elif defined(NC) || defined(TC)

#define KMAC_R fmacs
#define KMAC_I fnmacs
#define KMAC_I vmls.f32

#define FMAC_R1 fmacs
#define FMAC_R2 fmacs
#define FMAC_I1 fnmacs
#define FMAC_I1 vmls.f32
#define FMAC_I2 fmacs

#else

#define KMAC_R fnmacs
#define KMAC_R vmls.f32
#define KMAC_I fmacs

#define FMAC_R1 fmacs
#define FMAC_R2 fmacs
#define FMAC_I1 fnmacs
#define FMAC_I1 vmls.f32
#define FMAC_I2 fmacs

#endif
Expand Down
16 changes: 8 additions & 8 deletions kernel/arm/cgemm_kernel_2x2_vfpv3.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,10 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define FADD_R fsubs
#define FADD_I fadds

#define FMAC_R1 fnmacs
#define FMAC_R2 fnmacs
#define FMAC_R1 vmls.f32
#define FMAC_R2 vmls.f32
#define FMAC_I1 fmacs
#define FMAC_I2 fnmacs
#define FMAC_I2 vmls.f32

#elif defined(CN) || defined(CT)

Expand All @@ -118,7 +118,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

#define FMAC_R1 fmacs
#define FMAC_R2 fmacs
#define FMAC_I1 fnmacs
#define FMAC_I1 vmls.f32
#define FMAC_I2 fmacs

#elif defined(NC) || defined(TC)
Expand All @@ -127,7 +127,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define FADD_I fsubs

#define FMAC_R1 fmacs
#define FMAC_R2 fnmacs
#define FMAC_R2 vmls.f32
#define FMAC_I1 fmacs
#define FMAC_I2 fmacs

Expand All @@ -136,10 +136,10 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define FADD_R fsubs
#define FADD_I fadds

#define FMAC_R1 fnmacs
#define FMAC_R1 vmls.f32
#define FMAC_R2 fmacs
#define FMAC_I1 fnmacs
#define FMAC_I2 fnmacs
#define FMAC_I1 vmls.f32
#define FMAC_I2 vmls.f32

#endif

Expand Down
16 changes: 8 additions & 8 deletions kernel/arm/cgemv_n_vfp.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,42 +78,42 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

#if !defined(CONJ) && !defined(XCONJ)

#define KMAC_R fnmacs
#define KMAC_R vmls.f32
#define KMAC_I fmacs

#define FMAC_R1 fmacs
#define FMAC_R2 fnmacs
#define FMAC_R2 vmls.f32
#define FMAC_I1 fmacs
#define FMAC_I2 fmacs

#elif defined(CONJ) && !defined(XCONJ)

#define KMAC_R fmacs
#define KMAC_I fnmacs
#define KMAC_I vmls.f32

#define FMAC_R1 fmacs
#define FMAC_R2 fnmacs
#define FMAC_R2 vmls.f32
#define FMAC_I1 fmacs
#define FMAC_I2 fmacs

#elif !defined(CONJ) && defined(XCONJ)

#define KMAC_R fmacs
#define KMAC_I fnmacs
#define KMAC_I vmls.f32

#define FMAC_R1 fmacs
#define FMAC_R2 fmacs
#define FMAC_I1 fnmacs
#define FMAC_I1 vmls.f32
#define FMAC_I2 fmacs

#else

#define KMAC_R fnmacs
#define KMAC_R vmls.f32
#define KMAC_I fmacs

#define FMAC_R1 fmacs
#define FMAC_R2 fmacs
#define FMAC_I1 fnmacs
#define FMAC_I1 vmls.f32
#define FMAC_I2 fmacs

#endif
Expand Down
16 changes: 8 additions & 8 deletions kernel/arm/cgemv_t_vfp.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,42 +76,42 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

#if !defined(CONJ) && !defined(XCONJ)

#define KMAC_R fnmacs
#define KMAC_R vmls.f32
#define KMAC_I fmacs

#define FMAC_R1 fmacs
#define FMAC_R2 fnmacs
#define FMAC_R2 vmls.f32
#define FMAC_I1 fmacs
#define FMAC_I2 fmacs

#elif defined(CONJ) && !defined(XCONJ)

#define KMAC_R fmacs
#define KMAC_I fnmacs
#define KMAC_I vmls.f32

#define FMAC_R1 fmacs
#define FMAC_R2 fnmacs
#define FMAC_R2 vmls.f32
#define FMAC_I1 fmacs
#define FMAC_I2 fmacs

#elif !defined(CONJ) && defined(XCONJ)

#define KMAC_R fmacs
#define KMAC_I fnmacs
#define KMAC_I vmls.f32

#define FMAC_R1 fmacs
#define FMAC_R2 fmacs
#define FMAC_I1 fnmacs
#define FMAC_I1 vmls.f32
#define FMAC_I2 fmacs

#else

#define KMAC_R fnmacs
#define KMAC_R vmls.f32
#define KMAC_I fmacs

#define FMAC_R1 fmacs
#define FMAC_R2 fmacs
#define FMAC_I1 fnmacs
#define FMAC_I1 vmls.f32
#define FMAC_I2 fmacs

#endif
Expand Down
16 changes: 8 additions & 8 deletions kernel/arm/ctrmm_kernel_2x2_vfp.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,42 +98,42 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

#if defined(NN) || defined(NT) || defined(TN) || defined(TT)

#define KMAC_R fnmacs
#define KMAC_R vmls.f32
#define KMAC_I fmacs

#define FMAC_R1 fmacs
#define FMAC_R2 fnmacs
#define FMAC_R2 vmls.f32
#define FMAC_I1 fmacs
#define FMAC_I2 fmacs

#elif defined(CN) || defined(CT)

#define KMAC_R fmacs
#define KMAC_I fnmacs
#define KMAC_I vmls.f32

#define FMAC_R1 fmacs
#define FMAC_R2 fnmacs
#define FMAC_R2 vmls.f32
#define FMAC_I1 fmacs
#define FMAC_I2 fmacs

#elif defined(NC) || defined(TC)

#define KMAC_R fmacs
#define KMAC_I fnmacs
#define KMAC_I vmls.f32

#define FMAC_R1 fmacs
#define FMAC_R2 fmacs
#define FMAC_I1 fnmacs
#define FMAC_I1 vmls.f32
#define FMAC_I2 fmacs

#else

#define KMAC_R fnmacs
#define KMAC_R vmls.f32
#define KMAC_I fmacs

#define FMAC_R1 fmacs
#define FMAC_R2 fmacs
#define FMAC_I1 fnmacs
#define FMAC_I1 vmls.f32
#define FMAC_I2 fmacs

#endif
Expand Down
16 changes: 8 additions & 8 deletions kernel/arm/ctrmm_kernel_2x2_vfpv3.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,10 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define FADD_R fsubs
#define FADD_I fadds

#define FMAC_R1 fnmuls
#define FMAC_R2 fnmacs
#define FMAC_R1 vnmul.f32
#define FMAC_R2 vmls.f32
#define FMAC_I1 fmuls
#define FMAC_I2 fnmacs
#define FMAC_I2 vmls.f32

#elif defined(CN) || defined(CT)

Expand All @@ -105,7 +105,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

#define FMAC_R1 fmuls
#define FMAC_R2 fmacs
#define FMAC_I1 fnmuls
#define FMAC_I1 vnmul.f32
#define FMAC_I2 fmacs

#elif defined(NC) || defined(TC)
Expand All @@ -114,7 +114,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define FADD_I fsubs

#define FMAC_R1 fmuls
#define FMAC_R2 fnmacs
#define FMAC_R2 vmls.f32
#define FMAC_I1 fmuls
#define FMAC_I2 fmacs

Expand All @@ -123,10 +123,10 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define FADD_R fsubs
#define FADD_I fadds

#define FMAC_R1 fnmuls
#define FMAC_R1 vnmul.f32
#define FMAC_R2 fmacs
#define FMAC_I1 fnmuls
#define FMAC_I2 fnmacs
#define FMAC_I1 vnmul.f32
#define FMAC_I2 vmls.f32

#endif

Expand Down
Loading